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
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
12154734b4
Merge pull request #4520 from tianon/clarify-docs-branch-update
...
Clarify how to update the docs branch in the RELEASE-CHECKLIST with concrete instructions
Upstream-commit: ce091717809d05a00b37c2fe8a20dff0f2d9a5ad
Component: engine
2014-03-10 18:47:31 -06:00
4189aa7e42
Merge pull request #4567 from creack/merge_auth_registry
...
Merge auth package within registry
Upstream-commit: 7fc4cc0759469274715e36b2a77fb04a6919a431
Component: engine
2014-03-10 17:45:56 -07:00
6afe06b48d
Merge pull request #4515 from vieux/improve_sort_flags
...
improve alpha sort in mflag
Upstream-commit: 923962a4b5e8787449ff247400f0b30b4b04835d
Component: engine
2014-03-10 17:45:41 -07:00
9db05a87c8
Make docker use the signal pkg with strings
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 157f24ca77a38f7c5c2b22322a2a353d5098a21e
Component: engine
2014-03-10 17:36:47 -07:00
9d9d39b644
Create portable signalMap
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 10dc16dcd3aa82be256e5072a25dcf18af8e3844
Component: engine
2014-03-10 17:36:41 -07:00
357d278b81
Move signal to pkg
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: c5632622391921160687f3e0155bdfe3d3cfc07d
Component: engine
2014-03-10 17:36:32 -07:00
6c11019545
Merge pull request #4566 from srid/nsinit_uniq_errors
...
nsinit: prefix errors with their source
Upstream-commit: 0b8cd3ec8eb35f8b196ce841432563f3282297c7
Component: engine
2014-03-10 17:26:17 -07:00
4fcd3ec7b6
Merge auth package within registry
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 8d88ea0c15b7ce7fd2b0b695c498a7ffa0f2bc87
Component: engine
2014-03-10 17:16:58 -07:00
8f3c1c1399
nsinit: prefix errors with their source
...
Docker-DCO-1.1-Signed-off-by: Sridhar Ratnakumar <github@srid.name > (github: srid)
Upstream-commit: 03211ecce07ab64f5263232e1aa3c6248530c5b4
Component: engine
2014-03-10 17:08:50 -07:00
9e8481540f
Merge pull request #4564 from vieux/remove_unused_version
...
Remove unused version.go
Upstream-commit: bc513c5afb052c6a7e63436c4848b0a40f301bc7
Component: engine
2014-03-10 17:06:30 -07:00
