Tianon Gravi
065dd231dd
Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-31 03:16:42 -07:00
unclejack
59ec012efc
Merge pull request #3125 from rjeczalik/master
...
vagrant: added PRIVATE_NETWORK env var
2014-01-31 01:06:47 -08:00
Tianon Gravi
b4604ae7cf
Merge pull request #3822 from tianon/install-your-user
...
Make get.docker.io install directions slightly better by telling user exactly how to add themselves to the "docker" group
2014-01-31 00:56:30 -08:00
Tianon Gravi
56317c74f7
Merge pull request #3760 from tianon/better-nondocker-warning
...
Update hack/make.sh with slightly clearer output and a more precise "are we in the Docker container?" check
2014-01-31 00:54:44 -08:00
Tianon Gravi
d009cb0bed
Merge pull request #3848 from tianon/fix-yaml-space-parsing
...
Fix fun Travis DCO check YAML parsing issues (especially with commit messages that start with any kind of whitespace, like this one intentionally does)
2014-01-31 00:53:47 -08:00
Michael Crosby
d86c1b064d
Not not allocate networks first ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-30 23:10:19 -08:00
Victor Vieux
8fbdb7b59e
add setSubEnv and getSubEnv
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-31 04:01:46 +00:00
Victor Vieux
24086fa75d
job.error\* now return engine.StatusErr
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-31 04:01:46 +00:00
Victor Vieux
2b52d6e801
Remove api_params.go
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-31 03:59:14 +00:00
Victor Vieux
fc2f998822
remove some mkServerFromEngine
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-31 03:34:50 +00:00
Solomon Hykes
a0d82b17c7
Merge pull request #3863 from vieux/default_getint_0
...
changed default value of getenvint to 0. fix tests
2014-01-30 19:04:46 -08:00
Sven Dowideit
630459f2b8
add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kill see #3844
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-01-31 12:30:16 +10:00
Victor Vieux
1498cd4e05
use exists
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-31 02:21:59 +00:00
Victor Vieux
28b5ae8cc4
changed default value of getenvint to 0. fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-31 02:06:08 +00:00
Rafal Jeczalik
ce423cc9a8
vagrant: added PRIVATE_NETWORK env var
...
Docker-DCO-1.1-Signed-off-by: Rafal Jeczalik <rjeczalik@gmail.com> (github: rjeczalik)
2014-01-31 02:03:57 +01:00
Tianon Gravi
7ced204372
Merge pull request #3860 from vieux/integration_makefile
...
Add "make test-integration"
2014-01-30 16:10:27 -08:00
Andy Rothfusz
e64a9a3bad
Merge pull request #3758 from metalivedev/2720-running
...
Fixes 2720
2014-01-30 16:09:19 -08:00
Andy Rothfusz
98518bbcad
Fixed link to kernel dependencies. Wrapped long lines. Removed old tar dependency from list.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net> (github: metalivedev)
2014-01-30 16:03:13 -08:00
Victor Vieux
e4b3b391d6
Merge pull request #3858 from vieux/fix_testexitcode
...
fix TestExitCode
2014-01-30 15:52:28 -08:00
Victor Vieux
4326e541f8
add make test-integration
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-30 23:50:23 +00:00
Guillaume J. Charmes
9ae51c7403
Merge pull request #3859 from rogaha/add_missing_attributes
...
- Fixed the last cli.call's parameter from CmdSearch
2014-01-30 15:44:36 -08:00
Roberto G. Hashioka
2655a108e1
- Fixed the last cli.call's parameter from CmdSearch
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
2014-01-30 23:21:42 +00:00
Guillaume J. Charmes
45dd051e8e
Remove all darwin specific files and use more generic _unsupported with build tags.
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-01-30 23:10:56 +00:00
Victor Vieux
720f64af18
fix TestExitCode
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-30 22:59:21 +00:00
Victor Vieux
9481afa617
Merge pull request #3854 from vieux/fix_tests
...
remove TestAllocateTCPPortLocalhost faillure in tests
2014-01-30 13:59:32 -08:00
Victor Vieux
8e619e13ca
remove TestAllocateTCPPortLocalhost faillure in tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-30 21:53:32 +00:00
Victor Vieux
0c8ddd502e
Merge pull request #3833 from vieux/fix_env_conversion_issues
...
Fix env conversion issues in env
2014-01-30 13:31:25 -08:00
Victor Vieux
9261511aa5
refactor all *FromJob functions
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-30 20:45:32 +00:00
Tianon Gravi
c8d1596902
Fix fun Travis DCO check YAML parsing issues (especially with commit messages that start with any kind of whitespace, like this one intentionally does)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-30 12:27:45 -07:00
Victor Vieux
0942e5c89c
Merge pull request #3842 from jpoimboe/iptables-insert-masq
...
network: insert masq rule
2014-01-30 11:26:32 -08:00
Chia-liang Kao
b111fc3646
Use lxc-stop -k when lxc-kill is not found
...
lxc-kill was removed in lxc/lxc@33ddfc2
Docker-DCO-1.1-Signed-off-by: Chia-liang Kao <clkao@clkao.org> (github: clkao)
2014-01-31 03:22:22 +08:00
Andy Rothfusz
43b7667dcc
Merge pull request #3836 from SvenDowideit/mint-cgroups-lite-docs
...
Add troubleshooting for missing cgroups on mint 16
2014-01-30 10:58:26 -08:00
Victor Vieux
c7b415d3b4
Merge pull request #3846 from tianon/unclejack-maintainer
...
Make unclejack the official Vagrantfile maintainer
2014-01-30 10:55:38 -08:00
Tianon Gravi
238dba831a
Make unclejack the official Vagrantfile maintainer
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-30 11:51:25 -07:00
Michael Crosby
637a1dcab6
Merge pull request #3718 from alexlarsson/btrfs
...
Add btrfs support to docker
2014-01-30 10:00:44 -08:00
Josh Poimboeuf
cc382ec628
network: insert masq rule
...
This fixes IP masquerading on systems with reject rules at the end of
the POSTROUTING table, by inserting the rule at the beginning of the
table instead of adding it at the end.
Docker-DCO-1.1-Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> (github: jpoimboe)
2014-01-30 11:06:28 -06:00
Alexander Larsson
fab19d197c
Separate out graphdriver mount and container root
...
This separates out the directory as returned from the graphdriver (the
"base" fs) from the root filesystem of the live container. This is
necessary as the "diff" operation needs access to the base filesystem
without all the mounts that the running container needs (/.dockerinit,
volumes, etc).
We change container in the following way:
Container.RootfsPath() returns the the directory which will be used as
the root in a running container. It is always of the form
"/var/lib/docker/container/<id>/root" and is a private bind mount to
the base filesystem. It is only available while the container is running.
Container.BasefsPath() returns the raw directory from the graph driver
without the container runtime mounts. It is availible whenever the
container is mounted (in between a container.Mount()/Unmount() pair,
which are properly refcounted).
This fixes issue #3840
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-01-30 16:43:53 +01:00
Alexander Larsson
fc1169a220
pkg/mount: Add "private" flag
...
This allows "mount --make-private" functionallity.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-01-30 16:41:45 +01:00
Sven Dowideit
626a2e1112
Add troubleshooting for missing cgroups on mint 16 #3602
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
2014-01-30 20:53:27 +10:00
James Turnbull
41c10fb256
Merge pull request #3835 from thinkingbox/master
...
Fix typo
2014-01-29 23:55:36 -08:00
Piergiuliano Bossi
7d95ce6ddd
Fix typo
...
Docker-DCO-1.1-Signed-off-by: Piergiuliano Bossi <pgbossi@gmail.com> (github: thinkingbox)
2014-01-29 23:07:23 -05:00
Tianon Gravi
ab50985ac9
Merge pull request #3834 from philips/fix-socket-activation-systemd
...
contrib: systemd: make socket-activation Restart same as the main service file
2014-01-29 17:46:25 -08:00
Brandon Philips
4dab34c204
contrib: systemd: make socket-activation Restart=always
...
Do as was done to f09a78cd21 in the
socket-activation example.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-01-29 17:42:32 -08:00
Tianon Gravi
de8480f656
Merge pull request #3531 from lsm5/docker-systemd
...
ExecStartPre commands updated in systemd service file
2014-01-29 17:38:10 -08:00
Josh Hawn
c914abaf15
Prevent Tests from creating users on Prod Index
...
The integration tests had previously used the environment variable
DOCKER_INDEX_URL but it was apparently removed several months ago.
Change the integration auth tests to specify the ServerAddress field
of the AuthConfig struct to use the staging deployment of the index.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2014-01-29 17:18:11 -08:00
Victor Vieux
187646127f
fix convertion issues
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-30 00:56:42 +00:00
Victor Vieux
5b82a1b726
add tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-30 00:55:29 +00:00
Tianon Gravi
95dff84728
Merge pull request #3734 from stpierre/mkimage-yum
...
Added new mkimage-yum.sh script to create CentOS base images
2014-01-29 14:52:51 -08:00
Victor Vieux
54072dbbd6
fix ID -> Id api
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-29 20:31:49 +00:00
Tianon Gravi
94c5f51c4a
Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-29 13:13:32 -07:00