674ee1bc8e
Merge pull request #3828 from tianon/add-user-email-to-dockerfile
...
Add dummy "user.email" setting in our Dockerfile for smooth in-container merge commits
2014-01-31 11:03:17 -08:00
b881a6c3c2
merge master
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-31 19:00:06 +00:00
f267938fb8
Merge pull request #3844 from clkao/lxc-kill-deprecation
...
Use lxc-stop -k instead of lxc-kill
2014-01-31 10:57:40 -08:00
ff6409382b
Merge pull request #4 from tianon/cross-compile-and-release-linux-i386-and-arm-clients
...
Update/fix build tags, Dockerfile, and release.sh for proper building and releasing of linux/386 and linux/arm cross-compiled client binaries
2014-01-31 10:51:25 -08:00
51d280f944
merge master
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-31 18:43:34 +00:00
643c7dc25d
Merge pull request #3829 from vieux/fix_api_regression
...
Fix ID -> Id api
2014-01-31 10:38:57 -08:00
70ab72ff32
Merge pull request #3864 from SvenDowideit/lxc-kill-script-workaround-doc
...
add a known issue for lxc-1.0.0.beta3 and beyond for removeal of lxc-kil...
2014-01-31 10:27:04 -08:00
feea1dda41
Merge pull request #3861 from metalivedev/fixkerneldeps
...
Fixed link to kernel dependencies.
2014-01-31 10:25:25 -08:00
5258f833bc
Merge pull request #3866 from crosbymichael/dont-allocate-1
...
Do not allocate networks first ip
2014-01-31 09:47:28 -08:00
35ef0d37c2
Merge pull request #3800 from vieux/cleanup_jobs
...
Cleanup jobs
2014-01-31 06:55:12 -08:00
ce74c8b4d2
Ignore tar.TypeXGlobalHeader
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com> (github: amuino)
2014-01-31 14:57:30 +01:00
7b2ec7fb2d
Unit test ensuring that a tar.TypeXGlobalHeader does not cause an error
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com> (github: amuino)
2014-01-31 14:57:18 +01:00
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
59ec012efc
Merge pull request #3125 from rjeczalik/master
...
vagrant: added PRIVATE_NETWORK env var
2014-01-31 01:06:47 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
7ced204372
Merge pull request #3860 from vieux/integration_makefile
...
Add "make test-integration"
2014-01-30 16:10:27 -08:00
e64a9a3bad
Merge pull request #3758 from metalivedev/2720-running
...
Fixes 2720
2014-01-30 16:09:19 -08:00
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
e4b3b391d6
Merge pull request #3858 from vieux/fix_testexitcode
...
fix TestExitCode
2014-01-30 15:52:28 -08:00
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
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
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
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
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
9481afa617
Merge pull request #3854 from vieux/fix_tests
...
remove TestAllocateTCPPortLocalhost faillure in tests
2014-01-30 13:59:32 -08:00
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
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
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
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
0942e5c89c
Merge pull request #3842 from jpoimboe/iptables-insert-masq
...
network: insert masq rule
2014-01-30 11:26:32 -08:00
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
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
c7b415d3b4
Merge pull request #3846 from tianon/unclejack-maintainer
...
Make unclejack the official Vagrantfile maintainer
2014-01-30 10:55:38 -08:00
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
637a1dcab6
Merge pull request #3718 from alexlarsson/btrfs
...
Add btrfs support to docker
2014-01-30 10:00:44 -08:00
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
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
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
Michael Crosby
Victor Vieux
Guillaume J. Charmes
Andy Rothfusz
unclejack
Abel Muiño
Tianon Gravi
Solomon Hykes
Sven Dowideit
Rafal Jeczalik
Roberto G. Hashioka
Guillaume J. Charmes
Chia-liang Kao
Josh Poimboeuf
Alexander Larsson