746b307c72
Move all bind-mounts in the container inside the namespace
...
This moves the bind mounts like /.dockerinit, /etc/hostname, volumes,
etc into the container namespace, by setting them up using lxc.
This is useful to avoid littering the global namespace with a lot of
mounts that are internal to each container and are not generally
needed on the outside. In particular, it seems that having a lot of
mounts is problematic wrt scaling to a lot of containers on systems
where the root filesystem is mounted --rshared.
Note that the "private" option is only supported by the native driver, as
lxc doesn't support setting this. This is not a huge problem, but it does
mean that some mounts are unnecessarily shared inside the container if you're
using the lxc driver.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 6c266c4b42eeabe2d433a994753d86637fe52a0b
Component: engine
2014-03-13 20:01:29 +01:00
1cf50c0291
Move .dockerenv parsing to lxc driver
...
This is not needed for e.g. the native driver
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 636959e20ae368e470a5c2420aae4528245b2cf6
Component: engine
2014-03-13 20:01:29 +01:00
a6f4cbe233
Merge pull request #4638 from ichik1/cli-doc-minor-fix
...
Some minor fixes for cli docs
Upstream-commit: 51a46e6a4ff74d74307341593208285d61592608
Component: engine
2014-03-13 20:11:10 +10:00
6577c881e6
Merge pull request #4636 from phillipalexander/fix-license
...
Fix boilerplate text in Apache license
Upstream-commit: 0e871edfeb446528616f425335570ffd5676e256
Component: engine
2014-03-13 02:42:56 -04:00
4fa0fa1ea2
Fix boilerplate text in Apache license
...
This commit updates the Apache license boilerplate with actual information. The Apache license appendix (designed to be removed before publication) states:
```
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following boilerplate notice, with the fields enclosed by brackets "[]" replaced with your own identifying information. (Don't include the brackets!)...
```
Additionally, the copyright year was not included. Copyright notices must reflect the current year. This commit updates the listed year to 2014.
see: http://www.copyright.gov/circs/circ01.pdf for more info
Docker-DCO-1.1-Signed-off-by: Phillip Alexander <git@phillipalexander.io > (github: phillipalexander)
Upstream-commit: 73596b00e053fedbf42f7abb87728e7176e5a95c
Component: engine
2014-03-12 23:39:36 -07:00
e37e7c4783
Add missing options -t and -v to images subcommand doc
...
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
Upstream-commit: 841fcad0ba03ff71a27ad2892fab3fdc83d071d8
Component: engine
2014-03-13 15:19:42 +09:00
8cfe00dd36
Remove duplicated description of --mtu
...
commit baa70e975186bb0ee8a4b16b9374cb6e794f8975 duplicates
the description of --mtu.
This patch removes the duplicated description.
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
Upstream-commit: 471aa870f57e66128b08ec28e908fb1faacdfd40
Component: engine
2014-03-13 14:18:13 +09:00
4f20d92590
Merge pull request #4612 from tianon/cleaner-test-output
...
Cleaner test output
Upstream-commit: c7564b5e4d58c38e2f1ec5c4ab20b714b8949d28
Component: engine
2014-03-12 17:54:14 -07:00
fcd3746eaa
Merge pull request #4000 from cap10morgan/1141-merge-configs-on-commit
...
merge existing config when committing
Upstream-commit: db1afee3f023957adf43a4e9a565568e11e81d2d
Component: engine
2014-03-12 17:49:11 -07:00
062a18ea7d
Merge pull request #4619 from dgageot/patch-1
...
Update port_redirection.rst
Upstream-commit: 94f2d5240541c7652fbe8df4ab00dac49ef95dee
Component: engine
2014-03-13 09:31:16 +10:00
d287fccca7
Merge pull request #4492 from ichik1/add-ip-forward-to-docs
...
Update daemon docs for --ip-forward
Upstream-commit: 8e0a4802ab13f40242ab997c8b75395d45fd52c0
Component: engine
2014-03-12 16:29:33 -07:00
4c1f9818ed
Merge pull request #4621 from unclejack/fix_empty_cidfile
...
don't leave empty CIDFile behind
Upstream-commit: bd1c51259433d7f5d3f2502fab6e12a8f4b30248
Component: engine
2014-03-12 11:12:51 -07:00
80fe86e3ee
don't leave empty cidFile behind
...
This makes `--cidfile` clean up empty container ID files. These are
left behind when creating the container fails.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: a56d1b93a1a16ac482b5e30773664f2538949c53
Component: engine
2014-03-12 19:36:19 +02:00
1ddbcf97d9
Merge pull request #4604 from vieux/improve_deprecation_warning_flags
...
improve deprecation message
Upstream-commit: 63dee4ebc4a5b5be6302f170cb7cb034914dfcf0
Component: engine
2014-03-12 10:18:49 -07:00
ca8e67a716
Merge pull request #4603 from creack/fix_osx_attach
...
Fix OSX attach exit issue
Upstream-commit: ba49f5bce14e3cec900f3ab3bce9394d22d37db8
Component: engine
2014-03-12 10:08:55 -07:00
ec32d7aa38
Update port_redirection.rst
...
Fix flags
Upstream-commit: 2a5e1abaa93b0081446420cae9d6d7d3892b6d75
Component: engine
2014-03-12 15:42:10 +01:00
e1d60948d6
Merge pull request #4526 from Rovanion/master
...
All caps variables in normal bash should be avoided not to accidentally collide with environment variables.
Upstream-commit: 2ad16c88e24ba87fea9f31209e663bfb9ada51a0
Component: engine
2014-03-12 22:24:00 +10:00
83e2e667c9
Merge pull request #4143 from SvenDowideit/apt-cacher-example
...
Show some ENV / local updated baseimage tricks that use an apt-cacher-ng...
Upstream-commit: a5fa161ff8849a00d8e8806b6a65c70a9395d622
Component: engine
2014-03-12 08:20:42 -04:00
41f81364c7
fixes suggested by James
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 8bf63d532622e22070b92ee71dcb972ace4b9b40
Component: engine
2014-03-12 22:02:24 +10:00
c3a135a2b6
Exclude more "definitely not unit tested Go source code" directories from hack/make/test
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 99b6364790e59a70d57949792fa31014637c93ee
Component: engine
2014-03-12 01:18:12 -06:00
6f72a528dc
Clean up the "go test" output from "make test" to be much more readable/scannable
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: e1c48fa56007e1db028f7f83bfbf79c3d05feccd
Component: engine
2014-03-12 01:17:38 -06:00
a67771c164
Update daemon docs and help messages for --iptables and --ip-forward
...
Fix docs and help messages of --iptables and --ip-forward to describe the true case behaviour
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com > (github: ichik1)
Upstream-commit: b7ae9984fb541e8b53d09016e78ff352ce310c25
Component: engine
2014-03-12 13:50:03 +09:00
c9483fdf18
Merge pull request #4574 from tianon/fix-cgroup-hax
...
Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount...
Upstream-commit: f544ebd55aee0944f0b0ca03b2edd90eac312e4a
Component: engine
2014-03-11 22:21:01 -06:00
8eb1115205
Merge pull request #4541 from scollier/master
...
Adding the new options to the `docker ps` documentation.
Upstream-commit: bf009b530ef86e08c14d89ac169a73f4d722aa12
Component: engine
2014-03-12 11:36:12 +10:00
df49e2ea8e
Removing HEAD tag from last commit
...
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
Upstream-commit: fbf74eb079f6a96e006e703cb36c434206757fe6
Component: engine
2014-03-11 20:00:16 -05:00
7136e710cb
Adding CLI options to the commandline reference documentation.
...
Fixing bad DCO sig
URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
Upstream-commit: 7178b285a334ae202c9b6022a4917fd51733f1d1
Component: engine
2014-03-11 19:54:48 -05:00
8980d7490c
improve deprecation message
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: f0eb227548427f6fc829f2b270ad83d22bd90c69
Component: engine
2014-03-12 00:51:46 +00:00
e2cc165aaf
Adding the new options to the docker ps documentation.
...
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
Adding the new options to the `docker ps` documentation.
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
Adding CLI options to the commandline reference documentation.
URLs of pages are:
http://docs.docker.io/en/latest/reference/commandline/cli/
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
changing indention
Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com > (github: scollier)
Upstream-commit: baa70e975186bb0ee8a4b16b9374cb6e794f8975
Component: engine
2014-03-11 19:51:30 -05:00
5656d23221
Fix attach exit on darwin
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 95e5910ab23e3ef7b0154f64e1c6ae01bc647ab3
Component: engine
2014-03-11 17:51:29 -07:00
cdc0128c4c
Merge pull request #4598 from creack/fix_lxc
...
Fix lxc
Upstream-commit: f9fde52a073f7c5a8a283ee694939aabe01a81dd
Component: engine
2014-03-11 17:17:54 -07:00
b4ecbb8459
Merge pull request #4521 from tianon/release-checklist-origin
...
Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
Upstream-commit: 7b79f597f6b8e4985f78e5a6b78e5d6d1e6779dc
Component: engine
2014-03-11 14:34:47 -06:00
d1752e453e
Merge pull request #4504 from alexlarsson/devicemapper-waits
...
devmapper: Increase sleep times and unlock while sleeping
Upstream-commit: b55a79aa1cfedd981653f0e46bb0a8a73ccc6796
Component: engine
2014-03-11 13:17:53 -07:00
909b6bf3f3
Update parseLxcInfo to comply with new lxc1.0 format
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: fd0737df2c8ec8f0a4b4d8f20b2ad6e4c96adbd3
Component: engine
2014-03-11 12:08:32 -07:00
4be803250c
Remove goroutine leak upon error
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 721562f29685ebf3f3698113cf0ce8000c02e606
Component: engine
2014-03-11 11:39:28 -07:00
45bf14b1a8
Merge pull request #4491 from crosbymichael/add-pull-dep
...
Add deprecation warning for -t on pull
Upstream-commit: 3715f46b8bfeb4a5127e03c1a7b2beaf6a3cc341
Component: engine
2014-03-11 10:22:06 -07:00
27ee8116cc
Merge pull request #4589 from creack/update_maintainer
...
Update MAINTAINER email + add self to pkg/signal MAINTAINER
Upstream-commit: 0a6d9035cf37e567e4573fce5ac4b192c21abf47
Component: engine
2014-03-11 10:18:37 -07:00
d3002d9f6e
Merge pull request #4466 from alexlarsson/execdrivers
...
Move execdriver construction into execdriver/execdrivers
Upstream-commit: 7654bac4427f589a3b1b7ad18307ccd0b8479f8c
Component: engine
2014-03-11 10:14:20 -07:00
3d1071683c
Add deprecation warning for -t on pull
...
Closes #3410
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 15e52ccaadea996b409e2f62bcbdb1a088619e35
Component: engine
2014-03-11 10:11:05 -07:00
7dd068d585
Merge pull request #4499 from alexlarsson/fix-remove-fail
...
DeviceMapper: Succeed immediately when removing non-existant devices
Upstream-commit: af3ff044a2daaf00f50e17a244a5172b69a86a8e
Component: engine
2014-03-11 10:09:58 -07:00
c344e2f4a8
Merge pull request #4569 from dolph/master
...
spelling correction
Upstream-commit: 6169dafab3e3e1b582476177be2afd29704f5e57
Component: engine
2014-03-11 09:19:46 -07:00
b9ed459d1e
Merge pull request #4583 from kzys/freebsd-signal
...
Like signal_linux.go, we don't have import os and os/signal
Upstream-commit: 037f942a0b37cc79f42fc26cfdd9f665f075f099
Component: engine
2014-03-11 09:01:39 -07:00
57e56c8558
Move execdriver construction into execdriver/execdrivers
...
This can't be in execdriver (dependency loop) but should not be
hardcoded inside runtime.go either. So we put it in a subpackage.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 07c35b41a5a93f31111d47afcb1e6d2926b492a0
Component: engine
2014-03-11 16:37:19 +01:00
ed3716396b
Like signal_linux.go, we don't have import os and os/signal
...
Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com > (github: kzys)
Upstream-commit: b2cd89056f5c49746ee668946ce4e1771f3ce368
Component: engine
2014-03-11 23:14:58 +09:00
1f8b309aa9
Merge pull request #4577 from SvenDowideit/moltar-perl-modules
...
add Net::Docker CPAN module
Upstream-commit: e50a5fcb0d21716edfb997d2549b7c17a803bae7
Component: engine
2014-03-11 09:37:44 -04:00
01cbab9363
add Net::Docker CPAN module
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: b348ee0fd0e4f8d2cb453a08f2b0d174550a339d
Component: engine
2014-03-11 20:28:26 +10:00
b4c989ed6d
Add variable for DOCKER_LOGFILE to sysvinit and use append instead of overwrite in opening the logfile
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 76dc670f413de64361a8bb3efa3381331e796b21
Component: engine
2014-03-11 01:40:31 -06:00
be15eebe0b
Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount and thus work properly
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: b21f8872cc684c95a2e30cec9f7c744a78a819f8
Component: engine
2014-03-11 01:39:06 -06:00
84def4f523
Update email + add self to pkg/signal
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 915d967f556bc7bb3faea34db8a06ea64fd5de92
Component: engine
2014-03-10 20:26:45 -07:00
85cc4fc5d5
spelling correction
...
s/singal/signal/
Docker-DCO-1.1-Signed-off-by: Dolph Mathews <dolph.mathews@gmail.com > (github: dolph)
Upstream-commit: 18ea183ea0abd18cde0d17e57fc0fa9b19cfab08
Component: engine
2014-03-10 22:17:03 -05:00
11f1b48016
Merge pull request #4563 from creack/signal-improvment
...
Signal improvments
Upstream-commit: b5a544b02e2d6f5e880064f327bcb1d5d866e30e
Component: engine
2014-03-10 17:59:17 -07:00
Alexander Larsson
Sven Dowideit
James Turnbull
Phillip Alexander
Ken ICHIKAWA
Guillaume J. Charmes
Victor Vieux
unclejack
Michael Crosby
David Gageot
Tianon Gravi
Scott Collier
Guillaume J. Charmes
Michael Crosby
Kato Kazuyoshi
Dolph Mathews