d6d79998e2
Allow ARG to come before FROM to support variables in FROM.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f0a9c2e3f4ea101c8a56a31ae6cb11559bc78683
Component: engine
2017-04-07 17:57:47 -04:00
b5aca33d88
Merge pull request #32435 from thaJeztah/add-ubuntu-17.04-zesty
...
Add Ubuntu 17.04 Zesty Zapus
Upstream-commit: b3a66a4a286d329ac3530992fd132305ae563e4f
Component: engine
2017-04-07 14:50:56 -05:00
593669c329
Merge pull request #32283 from aboch/clearingress
...
Daemon to take care of ingress cleanup on cluster leave and graceful shutdown
Upstream-commit: 87562af45bf32efce55d9fceb141a655b82a33c4
Component: engine
2017-04-07 20:09:27 +02:00
a264afe36f
Merge pull request #32430 from allencloud/add-hosts-example-for-serviceSpec-in-swagger-yml
...
add hosts example for serviceSpec in swagger.yml
Upstream-commit: 9fe781a333e284cc9538474a72ff5f85e971bdac
Component: engine
2017-04-07 11:47:36 -04:00
072232e704
Merge pull request #32289 from adshmh/add-unit-tests-for-cli-command-secret-package
...
add unit tests for package cli/command/secret
Upstream-commit: 8b9d54c084c951f57219de706ddb45fc2305ca89
Component: engine
2017-04-07 15:26:40 +02:00
8737950bfd
Add Ubuntu 17.04 Zesty Zapus
...
Ubuntu 17.04 will be released soon http://releases.ubuntu.com/zesty/
Note that this is a short-term release, so will
EOL (and removed again) in 9 months
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a8c714a7c01e76391fa50e57dce9986091b1c79a
Component: engine
2017-04-07 13:58:44 +02:00
14ad9e03e4
add hosts example for serviceSpec in swagger.yml
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 412099baa9605149f58d1fe442a80c67bf7e3baa
Component: engine
2017-04-07 17:06:52 +08:00
ed5e7bb984
Merge pull request #32425 from tabakhase/patch-1
...
Fix install.sh of get.docker.com for debian-sudo
Upstream-commit: daaf9ddfa9a53fb82511accb8ad0fed381670a54
Component: engine
2017-04-07 10:08:28 +02:00
9908272490
Fix install.sh of get.docker.com for debian-sudo
...
repair sudo call on key-add for install / https://get.docker.com/
fix #32424
Signed-off-by: Tabakhase <github@tabakhase.com >
Upstream-commit: a704d06d581e880b81189567919642ae36442bd0
Component: engine
2017-04-07 05:07:22 +02:00
f6c6c2dac3
Merge pull request #30261 from aaronlehmann/rollout-mode
...
swarm: Add update/rollback order
Upstream-commit: 3de58eb2bca720be0f5940cdd928de7a96220174
Component: engine
2017-04-06 22:41:11 -04:00
be0fe36691
Merge pull request #30669 from catinthesky/issue30580
...
Fixing issue of docker top command failure when dealing with -m option
Upstream-commit: 7d8bf5d177127c61208e397bf8cf53b2f52ac9e7
Component: engine
2017-04-06 21:14:26 -04:00
9cc90bfd8d
Add integration test for START_FIRST update order
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 6763641d6932468a0503516bb32e39202989aa52
Component: engine
2017-04-06 17:23:36 -07:00
1623433ab1
Add support for update order
...
This parameter controls the order of operations when rolling out an
update task. Either the old task is stopped before starting the new one,
or the new task is started first, and the running tasks will briefly
overlap.
This commit adds Rollout to the API, and --update-order / --rollback-order
flags to the CLI.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 9b54994a8ada6ae15a4d2c3b925568e2061200ad
Component: engine
2017-04-06 17:23:36 -07:00
65ae5270f9
Merge pull request #32412 from anusha-ragunathan/plugin-enable
...
Add an initial smaller sleep time before net dialing plugin socket.
Upstream-commit: ad416fc311e947a6af05625d74ce3b3d92de2c94
Component: engine
2017-04-06 16:38:41 -07:00
a532c2b899
Merge pull request #32407 from dnephin/fix-rw-mode-compose-files
...
Support rw as a volume option in compose file
Upstream-commit: 30cdabd13f5cbb09370c3db3f5c7d1384043f3f4
Component: engine
2017-04-06 16:24:20 -04:00
6469db0655
Merge pull request #32391 from aaronlehmann/no-stack-traces
...
api: Don't include stack traces with errors
Upstream-commit: 106a9a7d72427e9ceb6ca96bce6d96f6c822ce1c
Component: engine
2017-04-06 13:10:34 -07:00
a57f229b8d
Merge pull request #31867 from vieux/fix_bash_warning
...
fix bash error in release.sh
Upstream-commit: e49652c6f8fc0d115a567098b8c308f085963b8c
Component: engine
2017-04-06 21:45:00 +02:00
0827c488f7
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 >
Upstream-commit: a7ddc9d7e6c14494e7ab3fa80d07b1b371c6ec5b
Component: engine
2017-04-06 11:56:26 -07:00
270cc52d25
Add an initial smaller sleep time before net dialing plugin socket.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 891f9acb7b4e868df74c0f674eb84780e4e04149
Component: engine
2017-04-06 11:16:35 -07:00
6f724a82a6
Merge pull request #28938 from elifa/master
...
Grace period option to health checks.
Upstream-commit: c4010e257f60d4204c5c2f5dc5a8aa5313d1b254
Component: engine
2017-04-06 19:23:56 +02:00
63121bcc21
Merge pull request #32401 from ijc25/gotty-terminfo-fixes
...
Revendor github.com/Nvveen/Gotty for github.com/Nvveen/Gotty#2
Upstream-commit: e4c608abe99b0ca2a1a454792780da8f59674f12
Component: engine
2017-04-06 09:01:30 -07:00
0d79f39f39
Support rw as a volume option in compose file.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 062830535df4d944fd8e4d626f3da5bdc7b1993a
Component: engine
2017-04-06 10:32:35 -04:00
d862a42e27
Merge pull request #32387 from Microsoft/jjh/tidystat
...
Tidy pkg\system *stat* functions
Upstream-commit: fa3e2d5ab9b577cecd24201902bbe72b3f1b851c
Component: engine
2017-04-06 08:40:27 -04:00
d9412325fb
Merge pull request #32364 from aaronlehmann/preserve-env-order
...
cli: Preserve order of environment variables
Upstream-commit: f5d881b835fbc12fdb4b0840ab26333170c705f3
Component: engine
2017-04-06 14:25:29 +02:00
f9282bea00
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 >
Upstream-commit: b7ced33036f24852e7d8095c7f38f5bb8d2b8ef9
Component: engine
2017-04-06 12:19:32 +01:00
e25f6c5a1b
Added start period option to health check.
...
Signed-off-by: Elias Faxö <elias.faxo@gmail.com >
Upstream-commit: e401f63735d8ebcff387c571d1f61ce52bdea86e
Component: engine
2017-04-06 12:35:34 +02:00
859b7948a5
Merge pull request #32395 from prertik/master
...
updated experimental/Readme.md with fixed deadlinks
Upstream-commit: 5b18e7c3962dfbe472199fc5e868d02de6dac40c
Component: engine
2017-04-06 09:01:27 +02:00
3b00f427b7
updated Readme.md with fixed deadlinks
...
Signed-off-by: prertik <prertik@outlook.com >
Upstream-commit: 718847c742107a3b6fe4a172f7fa63ed559d69ae
Component: engine
2017-04-06 12:31:18 +05:45
1598da861b
Merge pull request #32392 from aluzzardi/revendor-swarmkit
...
[master] Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560
Upstream-commit: 2aed764baff9c76a51689164c2cce7f54dbcf88b
Component: engine
2017-04-06 13:18:17 +09:00
2b71862e00
Merge pull request #32383 from Microsoft/jjh/removeunused
...
Windows: Remove unused process_windows.go
Upstream-commit: 9691170de99cf2e306640ec64f2c9d787100dfa9
Component: engine
2017-04-05 23:32:40 -04:00
7647ce4c36
Re-vendor docker/swarmkit to d2e48a332063ccd4ea26b6262ee717de997de560
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 367b57d9859d2e3b4a651eb31d2d17f425329783
Component: engine
2017-04-05 18:49:23 -07:00
75b06f1d80
api: Don't include stack traces with errors
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 7381fffb2f0a0307ef1575a299028d036f24088f
Component: engine
2017-04-05 18:13:58 -07:00
55def0f77c
Daemon to take care of ingress cleanup on leave & shutdown
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 6f4bb796ddb82d04a1c379a950db93bc61c64c04
Component: engine
2017-04-05 16:31:43 -07:00
29ed9a4779
Vendoring libnetwork @f3c4ca8
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: bf5bebdfa0f7cc140f1c94d0e222aab714cbbcfb
Component: engine
2017-04-05 16:31:28 -07:00
408ae7e45b
Tidy pkg\system *stat* functions
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 16c1ede79c1771cd95642ff022e75032b594d604
Component: engine
2017-04-05 16:01:53 -07:00
ed86f7c60d
Merge pull request #32251 from AkihiroSuda/run-mount
...
cli: add `--mount` to `docker run`
Upstream-commit: 945a119c8a52118ebee6c53f46e9846ea9e76c5e
Component: engine
2017-04-05 22:34:47 +02:00
19149ea4f2
Edits to CLI reference
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 6d3eecd8cf303f9f1588ef851e3bd8fe83fcbb8d
Component: engine
2017-04-05 11:27:09 -07:00
e2c2909317
Windows: Remove unused process_windows.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 329daee5ef737fed010e1995555064b44bea1efe
Component: engine
2017-04-05 11:04:34 -07:00
5be33d2273
Merge pull request #30424 from yongtang/30376-node-ls-format
...
Add `--format` for `docker node ls`
Upstream-commit: 833f1f44245c9e9514b931b19831ee58594f6b10
Component: engine
2017-04-05 16:53:54 +02:00
3d4ee5930c
Merge pull request #32268 from cpuguy83/volume_err_obfuscate
...
don't obfuscate error during volume create
Upstream-commit: b7c3b312c92c6a0f897379f583befa6b5ab9c4fe
Component: engine
2017-04-05 09:05:10 -04:00
6c1668c7bd
cli: add --mount to docker run
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 77fe35b3b903831bd9cfb60a806d056195dc14b6
Component: engine
2017-04-05 04:52:08 +00:00
9e0bb0561c
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 >
Upstream-commit: b426741c1504d45d0e1dd6d76ec5144bd95aa480
Component: engine
2017-04-04 18:16:57 -07:00
b6572ab4d8
Merge pull request #32358 from mstanleyjones/fix-liquid
...
Escape some double brackets
Upstream-commit: 8d96619e5a367798cffcb740cfc41e0a505a5232
Component: engine
2017-04-05 00:35:45 +02:00
594d540270
Merge pull request #32352 from KarthikNayak/32174
...
Docs: Add the flag `--api-enable-cors` to deprecated.md
Upstream-commit: b9e9518bfee26e859eee1cbd4b6ca9e7be637c42
Component: engine
2017-04-04 15:22:04 -07:00
1eb46d2b87
Merge pull request #32350 from vdemeester/start-stack-trap-earlier
...
Start the stack trap earlier for daemon
Upstream-commit: 5f14f4a94928a4de60944eb822cc379ab1aee7e3
Component: engine
2017-04-04 23:56:36 +02:00
b44fd1c414
Merge pull request #32346 from thaJeztah/dont-warn-on-make-install
...
do not show errors on make install
Upstream-commit: cb0c905b6a346b4b117393c8c54169d62ea1c235
Component: engine
2017-04-04 23:55:54 +02:00
b40d1c6a48
Merge pull request #32063 from tonistiigi/named-contexts
...
Add support for named build stages
Upstream-commit: 2e96c1739be45f2ff8342cb3e222db3eb1616839
Component: engine
2017-04-04 12:53:59 -07:00
964a70f1c3
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 >
Upstream-commit: 7328ae12cc3e14b3eb6ab01f09f6d94a82a44066
Component: engine
2017-04-04 12:46:44 -07:00
3692f9bbbf
added unit tests for package cli/command/secret
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 243a8e69ff6141a27fb2e56e1101fb2e70822ab4
Component: engine
2017-04-04 15:35:08 -04:00
c7270d4d81
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 >
Upstream-commit: 32e21ecbfe3af9a8b5762ad1a549518221c4939e
Component: engine
2017-04-04 11:26:35 -07:00
