0e3f2f2ac0
Ensure clean engine shutdown on startup errors
...
Previously on error either from the daemon or from the api it is just
exiting with exit status 1 but not performing a shutdown.
This can produce insconsistent state depending on where the error came
from.
This makes sure that before we exit on error that the engine gets fully
shutdown.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-03-09 08:40:38 -04:00
2a8a2d2428
Merge pull request #11189 from ahmetalpbalkan/win-cli/archive-path-separator
...
pkg/archive_windows: make use of os.PathSeparator
2015-03-05 22:25:20 -05:00
94fca50de0
Merge pull request #11125 from moypray/http_proxy
...
docker info display http/https_proxy setting
2015-03-05 20:26:20 -05:00
8ba64b383d
pkg/archive_windows: make use of os.PathSeparator
...
cc: @jhowardmsft
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-05 17:15:11 -08:00
06a40f0f28
docker info display http/https_proxy setting
...
Signed-off-by: Zhang Wentao <zhangwentao234@huawei.com>
2015-03-06 09:02:21 +08:00
92e632c84e
Merge pull request #11064 from delftswa2014/10970-treesize
...
Move directory size calculation to pkg/ (fixes #10970 )
2015-03-05 13:06:02 -08:00
c40993777f
Merge pull request #11138 from tianon/go-autogen
...
Rename .dockerversion to .go-autogen so it's clear that all autogenerated code goes here
2015-03-05 13:00:32 -08:00
78989424bc
Merge pull request #11179 from rhatdan/selinux-fixes
...
Two SELinux Changes.
2015-03-05 12:19:10 -08:00
27acf7b4ac
Merge pull request #11156 from jfrazelle/ulimit-skip-lxc
...
Skip new ulimits test on lxc
2015-03-05 12:18:52 -08:00
0bf6015745
Merge pull request #11172 from duglin/5169-LinkEnvDocs
...
Add some text about env vars when linking containers
2015-03-05 12:18:04 -08:00
4eb2fd169f
Two SELinux Changes.
...
daemon/volumes.go
This SetFileCon call made no sense, it was changing the labels of any
directory mounted into the containers SELinux label. If it came from me,
then I apologize since it is a huge bug.
The Volumes Mount code should optionally do this, but it should not always
happen, and should never happen on a --privileged container.
The change to
daemon/graphdriver/vfs/driver.go, is a simplification since this it not
a relabel, it is only a setting of the shared label for docker volumes.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-03-05 13:55:44 -05:00
e4a90897e1
Merge pull request #11151 from chenhanxiao/See-also-export-import-save-load
...
docs: add See Also for description of export/import and save/load
2015-03-05 10:35:37 -08:00
3c9425d40d
Add some text about env vars when linking containers
...
In particular, the security implications.
Closes #5169
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-05 09:39:10 -08:00
620339f166
Merge pull request #11173 from estesp/cleanup-etc-cover-test
...
Clarify/cleanup "/etc" volume overlays special /etc mounts test
2015-03-05 10:47:36 -05:00
214eae6f53
Merge pull request #11163 from duglin/RmiTest
...
Better error message for `docker rmi ''`
2015-03-05 09:49:46 -05:00
b5036ad5c6
Clarify/cleanup "/etc" volume overlays special /etc mounts test
...
Added link to original issue and clarified text so someone without any
background on the original issue can understand why the test exists.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-03-05 09:41:56 -05:00
7125ae00bb
Merge pull request #11168 from estesp/no-inotify-overlayfs
...
Don't test resolv.conf updater on overlay filesystem
2015-03-05 14:04:22 +00:00
9057ca2541
Don't test resolv.conf updater on overlay filesystem
...
The overlay filesystem does not support inotify at this time. The
resolv.conf updater test was passing on overlay-based Jenkins because of
a fluke--because it was DIND, /etc/resolv.conf on the "host" was really
a bind-mounted resolv.conf from the outer container, which means a watch
directly on that file worked as it was not overlay backed. The new test
(from #10703 ) unmounts the bind-mounted copy to test create and modify
code-paths, which caused us to hit the issue.
This PR also adds a note to the docs about the lack of auto-update when
using the overlay storage driver.
See https://lkml.org/lkml/2012/2/28/223 for more info on inotify and
overlay.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-03-05 00:22:01 -05:00
cbb149f52f
docs: add See Also for description of export/import and save/load
...
make them reference to each other.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
2015-03-04 20:21:38 -05:00
5035fa1e21
Merge pull request #11162 from SvenDowideit/if-nil-call-with-nil
...
Seems like an un-necessary if statement
2015-03-04 13:59:27 -08:00
4e5ea0c875
Seems like an un-necessary if statement
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-03-04 13:24:17 -08:00
eeb36c9348
Better error message for "docker rmi ''"
...
See: https://github.com/docker/docker/issues/10867
While looking at #10867 I noticed that the error message generated for
a blank image ID wasn't very helpful so this fixes that.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-04 13:21:59 -08:00
e2b8933d21
Move directory size calculation to pkg/ ( fixes #10970 )
...
Signed-off-by: Martijn Dwars <ikben@martijndwars.nl>
2015-03-04 21:16:31 +01:00
e0823b09ec
Merge pull request #11000 from anandkumarpatel/invalidate-probe
...
Improve build speed
2015-03-04 11:35:00 -08:00
7b3ffd5cc0
Merge pull request #10586 from resouer/10532-fix-cors-hardcode
...
Fix 10532 to change --api-enable-cors to string.
2015-03-04 18:42:20 +00:00
4bccf278bd
Merge pull request #11046 from bfirsh/rename-fig-to-compose
...
Rename fig to compose
2015-03-04 08:39:01 -08:00
a6824ea7f2
Rename fig to compose
...
It's now at https://github.com/docker/compose
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-03-04 16:35:56 +00:00
80d585b0c7
Skip new ulimits test on lxc
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-03-04 08:28:32 -08:00
2380004d30
Merge pull request #10713 from swagiaal/pickup-created-resolvconf
...
Update resolv.conf in containers on file creation.
2015-03-04 10:21:36 -05:00
973c32c8a0
Merge pull request #11147 from ahmetalpbalkan/archive_test_fix
...
pkg/archive: rm invalid test case from achive_windows_test.go
2015-03-04 09:51:36 -05:00
ffc738225d
Merge pull request #11030 from jfrazelle/skip-lxc-remaining-tests
...
Last three tests skip on lxc.
2015-03-04 09:51:06 -05:00
321874f376
Last three tests skip on lxc.
...
Now we can scale lxc tests to all PRs.
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
2015-03-04 06:04:25 -08:00
0f6704f961
Merge pull request #11077 from tianon/debootstrap-PATH
...
Update debootstrap PATH+chroot handling
2015-03-04 06:01:25 -08:00
ffc755ac14
Merge pull request #11134 from duglin/CheckMultiLineHelp
...
Fix 'docker ps --help' so the options don't span more than one line
2015-03-04 05:53:47 -08:00
e2c79e2b30
Merge pull request #11155 from coolljt0725/add_xfs_magic
...
Fix docker info show unknown backing filesystem when use xfs
2015-03-04 07:59:23 -05:00
df7ba57f5f
Merge pull request #9437 from cpuguy83/set_rlimits_in_container
...
Allow setting ulimits for containers
2015-03-04 04:00:17 -08:00
d64b009bc0
Merge pull request #11133 from zenlinTechnofreak/zenlinFormatBridgeDriver
...
Just format some logs and notes in /daemon/networkdriver/bridge/driver.g...
2015-03-04 03:57:29 -08:00
a8b699f5d9
Merge pull request #10798 from ahmetalpbalkan/win-cli/TestEventsUntag-fix
...
integration-cli: Remove timeout dependency on TestEventsUntag
2015-03-04 03:54:33 -08:00
beea697be3
Merge pull request #10858 from duglin/10807-MixedcaseDockerfile
...
Support dockerfile and Dockerfile
2015-03-04 03:52:49 -08:00
dd56fa1906
Add xfs fs magic to graphdriver/driver.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-03-04 19:01:39 +08:00
98630b2ef6
Merge pull request #11051 from bdehamer/add-registry-api-client-library
...
Add reference to docker-reg-client
2015-03-03 20:41:42 -08:00
baebff38d5
pkg/archive: rm invalid test case from achive_windows_test.go
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-03 18:42:52 -08:00
15924f2385
Support dockerfile and Dockerfile
...
Closes #10807
Adds support for `dockerfile` ONLY when `Dockerfile` can't be found.
If we're building from a Dockerfile via stdin/URL then always download
it a `Dockerfile` and ignore the -f flag.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-03 18:38:50 -08:00
5929f401fc
Merge pull request #11091 from chenhanxiao/See-also-login-start
...
docs: add See Also for description of login/logout and start/stop
2015-03-03 14:49:59 -08:00
b47ab8cfa3
Merge pull request #11140 from SvenDowideit/correct-notes-markup
...
Notes should be indented
2015-03-03 14:16:56 -08:00
93c82360a6
Notes should be indented
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-03-03 13:58:35 -08:00
8625a281c6
Rename .dockerversion to .go-autogen so it's clear that all autogenerated code goes here
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-03 12:42:38 -07:00
5595da2bde
Fix 'docker ps --help' so the options don't span more than one line
...
and add a testcase to catch this in the future.
While in there I also:
- removed extra periods from the few options that had them (new test)
- made the --filter option consistent across all command
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-03-03 10:02:23 -08:00
2c0e027ab9
Just format some logs and notes in /daemon/networkdriver/bridge/driver.go
...
Signed-off-by: Zen Lin(Zhinan Lin) <linzhinan@huawei.com>
2015-03-03 23:39:04 +08:00
dc0a6c1f5e
Rebase & update api doc v1.18 instead
...
Signed-off-by: harry zhang <resouer@163.com>
2015-03-03 12:32:17 +08:00
Brian Goff
Doug Davis
Tibor Vass
Ahmet Alp Balkan
Zhang Wentao
Michael Crosby
Dan Walsh
Fred Lifton
Doug Davis
Phil Estes
Phil Estes
Jessie Frazelle
Chen Hanxiao
Alexander Morozov
Sven Dowideit
Martijn Dwars
Ben Firshman
Jessica Frazelle
Lei Jitang
moxiegirl
Tianon Gravi
Zen Lin(Zhinan Lin)
resouer