0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
31821 commits 14 branches 412 tags 338 MiB
Commit graph

31821 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Goff
7d8bf5d177 Merge pull request #30669 from catinthesky/issue30580 
Fixing issue of docker top command failure when dealing with -m option
 2017-04-06 21:14:26 -04:00
Anusha Ragunathan
ad416fc311 Merge pull request #32412 from anusha-ragunathan/plugin-enable 
Add an initial smaller sleep time before net dialing plugin socket.
 2017-04-06 16:38:41 -07:00
Brian Goff
30cdabd13f Merge pull request #32407 from dnephin/fix-rw-mode-compose-files 
Support rw as a volume option in compose file
 2017-04-06 16:24:20 -04:00
Anusha Ragunathan
106a9a7d72 Merge pull request #32391 from aaronlehmann/no-stack-traces 
api: Don't include stack traces with errors
 2017-04-06 13:10:34 -07:00
Sebastiaan van Stijn
e49652c6f8 Merge pull request #31867 from vieux/fix_bash_warning 
fix bash error in release.sh
 2017-04-06 21:45:00 +02:00
Tianon Gravi
a7ddc9d7e6 Update SKIP_RELEASE_BUILD to only check for the string "1" (so it has to be exactly "SKIP_RELEASE_BUILD=1" to skip the release build) 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2017-04-06 11:56:26 -07:00
Anusha Ragunathan
891f9acb7b Add an initial smaller sleep time before net dialing plugin socket. 
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
 2017-04-06 11:16:35 -07:00
Sebastiaan van Stijn
c4010e257f Merge pull request #28938 from elifa/master 
Grace period option to health checks.
 2017-04-06 19:23:56 +02:00
Tõnis Tiigi
e4c608abe9 Merge pull request #32401 from ijc25/gotty-terminfo-fixes 
Revendor github.com/Nvveen/Gotty for github.com/Nvveen/Gotty#2
 2017-04-06 09:01:30 -07:00
Daniel Nephin
062830535d Support rw as a volume option in compose file. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-04-06 10:32:35 -04:00
Brian Goff
fa3e2d5ab9 Merge pull request #32387 from Microsoft/jjh/tidystat 
Tidy pkg\system *stat* functions
 2017-04-06 08:40:27 -04:00
Vincent Demeester
f5d881b835 Merge pull request #32364 from aaronlehmann/preserve-env-order 
cli: Preserve order of environment variables
 2017-04-06 14:25:29 +02:00
Ian Campbell
b7ced33036 Revendor github.com/Nvveen/Gotty for github.com/Nvveen/Gotty#2 
This fixes https://github.com/docker/docker/issues/32400

We were already actually vendoring from github.com/ijc25/Gotty in order to
pickup github.com/Nvveen/Gotty#1. github.com/ijc25/Gotty#master now contains
merges of both of those upstream PRs.

Signed-off-by: Ian Campbell <ian.campbell@docker.com>
 2017-04-06 12:19:32 +01:00
Elias Faxö
e401f63735 Added start period option to health check. 
Signed-off-by: Elias Faxö <elias.faxo@gmail.com>
 2017-04-06 12:35:34 +02:00
Sebastiaan van Stijn
5b18e7c396 Merge pull request #32395 from prertik/master 
updated experimental/Readme.md with fixed deadlinks
 2017-04-06 09:01:27 +02:00
Pratik Karki
718847c742 updated Readme.md with fixed deadlinks 
Signed-off-by: prertik <prertik@outlook.com>
 2017-04-06 12:31:18 +05:45
Akihiro Suda
2aed764baf Merge pull request #32392 from aluzzardi/revendor-swarmkit 
[master] Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560
 2017-04-06 13:18:17 +09:00
Brian Goff
9691170de9 Merge pull request #32383 from Microsoft/jjh/removeunused 
Windows: Remove unused process_windows.go
 2017-04-05 23:32:40 -04:00
Andrea Luzzardi
367b57d985 Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
 2017-04-05 18:49:23 -07:00
Aaron Lehmann
7381fffb2f api: Don't include stack traces with errors 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-05 18:13:58 -07:00
John Howard
16c1ede79c Tidy pkg\system *stat* functions 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-04-05 16:01:53 -07:00
Vincent Demeester
945a119c8a Merge pull request #32251 from AkihiroSuda/run-mount 
cli: add `--mount` to `docker run`
 2017-04-05 22:34:47 +02:00
Sebastiaan van Stijn
7b5c179ef4 Merge pull request #32382 from mstanleyjones/master 
Edits to CLI reference
 2017-04-05 21:04:06 +02:00
Misty Stanley-Jones
6d3eecd8cf Edits to CLI reference 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-04-05 11:27:09 -07:00
John Howard
329daee5ef Windows: Remove unused process_windows.go 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2017-04-05 11:04:34 -07:00
Sebastiaan van Stijn
833f1f4424 Merge pull request #30424 from yongtang/30376-node-ls-format 
Add `--format` for `docker node ls`
 2017-04-05 16:53:54 +02:00
Brian Goff
b7c3b312c9 Merge pull request #32268 from cpuguy83/volume_err_obfuscate 
don't obfuscate error during volume create
 2017-04-05 09:05:10 -04:00
Akihiro Suda
77fe35b3b9 cli: add --mount to docker run 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-04-05 04:52:08 +00:00
Aaron Lehmann
b426741c15 cli: Preserve order of environment variables 
Unless we are adding or removing environment variables, their order
shouldn't be changed. This makes it look like the service's TaskSpec has
changed relative to the old version of the service, and containers need
to be redeployed.

The existing code always rebuilds the list of environment variables by
converting them to a map and back, but there's no reason to do this if
no environment variables are being added.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-04-04 18:16:57 -07:00
Sebastiaan van Stijn
8d96619e5a Merge pull request #32358 from mstanleyjones/fix-liquid 
Escape some double brackets
 2017-04-05 00:35:45 +02:00
Victor Vieux
b9e9518bfe Merge pull request #32352 from KarthikNayak/32174 
Docs: Add the flag `--api-enable-cors` to deprecated.md
 2017-04-04 15:22:04 -07:00
Vincent Demeester
5f14f4a949 Merge pull request #32350 from vdemeester/start-stack-trap-earlier 
Start the stack trap earlier for daemon
 2017-04-04 23:56:36 +02:00
Vincent Demeester
cb0c905b6a Merge pull request #32346 from thaJeztah/dont-warn-on-make-install 
do not show errors on make install
 2017-04-04 23:55:54 +02:00
Victor Vieux
2e96c1739b Merge pull request #32063 from tonistiigi/named-contexts 
Add support for named build stages
 2017-04-04 12:53:59 -07:00
Yong Tang
7328ae12cc Add hidden placeholder of .Self for docker node ls --format 
This commit adds a hidden placeholder of `.Self` for
`docker node ls --format` so that if the node is the same
as the current docker daemon, then a `*` is outputed.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-04-04 12:46:44 -07:00
Yong Tang
32e21ecbfe Add --format for docker node ls 
This fix tries to address the comment https://github.com/docker/docker/pull/30376#discussion_r97465334
where it was not possible to specify `--format` for `docker node ls`. The `--format` flag
is a quite useful flag that could be used in many places such as completion.

This fix implements `--format` for `docker node ls` and add `nodesFormat` in config.json
so that it is possible to specify the output when `docker node ls` is invoked.

Related documentations have been updated.

A set of unit tests have been added.

This fix is related to #30376.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-04-04 11:26:35 -07:00
Misty Stanley-Jones
622bdadfd7 Escape some double brackets 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2017-04-04 10:06:32 -07:00
Tonis Tiigi
79ccb3478f Add a multi stage trusted build testcase 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-04-04 09:56:00 -07:00
Vincent Demeester
f6b7dc9837 Merge pull request #32347 from cpuguy83/fix_volumestore_panic 
Fix panic on error looking up volume driver
 2017-04-04 18:55:13 +02:00
Tõnis Tiigi
6abbc933ae Merge pull request #31750 from dnephin/some-builder-cleanup 
Fix `docker build --label` when the label includes single quotes and a space
 2017-04-04 09:37:00 -07:00
Tonis Tiigi
672ea30a94 Add support for FROM using named block 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-04-04 09:34:28 -07:00
Tonis Tiigi
73b4b8ed7f Implicit copy-from with reference 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-04-04 09:34:28 -07:00
Tonis Tiigi
87512bbc84 Add named context support 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-04-04 09:34:28 -07:00
Sebastiaan van Stijn
fe4d7db1ec Merge pull request #30813 from yongtang/30232-service-ls-ports 
Add `PORTS` field for `docker service ls` (`ingress`)
 2017-04-04 17:04:27 +02:00
Karthik Nayak
85f92ef359
Docs: Add the flag --api-enable-cors to deprecated.md 
Signed-off-by: Karthik Nayak <Karthik.188@gmail.com>
 2017-04-04 20:04:42 +05:30
Vincent Demeester
94d44066f3
Start the stack trap earlier for daemon 
That way we can get stack dump earlier if there is something that
locks the daemon during start/restore phase.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-04 16:23:14 +02:00
Vincent Demeester
d7e7aa67ea Merge pull request #32274 from mlaventure/fix-healthcheck-rm-race 
Ensure health probe is stopped when a container exits
 2017-04-04 16:14:10 +02:00
Brian Goff
5baf8a4118 Fix panic on error looking up volume driver 
(－‸ლ)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-04-04 09:22:01 -04:00
Sebastiaan van Stijn
2443decdd5
do not show errors on make install 
When running "make install" in a build container,
docker is not installed the first time it's
run, causing these errors to appear;

    $ make install
    hack/make/.detect-daemon-osarch: line 11: docker: command not found
    hack/make/.detect-daemon-osarch: line 11: docker: command not found
    hack/make/.detect-daemon-osarch: line 11: docker: command not found
    hack/make/.detect-daemon-osarch: line 11: docker: command not found
    KEEPBUNDLE=1 hack/make.sh install-binary

This patch checks if docker exists, and if not
just continues silently :)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-04-04 15:19:50 +02:00
Sebastiaan van Stijn
6b06cc54d0 Merge pull request #29099 from dattatrayakumbhar/28755_Err_Duplicate_checkpoint 
#28755: [experimental] Proper error handling for checkpoint conflict
 2017-04-04 14:40:20 +02:00