cf0e8d8d85
Merge pull request #24533 from yongtang/24392-docker-info-label-duplicate-keys
...
Remove duplicate keys in labels of `docker info`
Upstream-commit: 411e7b4416fbac0601db1fa28b5152c23fcaf7bb
Component: engine
2016-10-24 18:12:28 -07:00
b9b1cc3362
Merge pull request #27697 from amitkris/fix_units_import
...
Correct go-units import in cli/command/formatter/stats.go
Upstream-commit: ec30cf4f14d8f8536b1b7b81e2992eb5c7021b1c
Component: engine
2016-10-24 16:59:15 -07:00
11895badbe
Merge pull request #27223 from mlaventure/merge-experimental
...
Make experimental a runtime flag
Upstream-commit: ba41a5edac16857121779434cd80b86dcdb0ffda
Component: engine
2016-10-24 16:58:32 -07:00
4e1fb8f8f9
Merge pull request #27624 from erxian/remove-duplicate-err-judgement
...
remove duplicated error judgement in cluster.go
Upstream-commit: 09985ad89741dcc7cf0f8add500189d09d484b61
Component: engine
2016-10-24 16:11:53 -07:00
9a299b360f
Make experimental a runtime flag
...
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 7781a1bf0fef748877326632b88e92fbf3c90daa
Component: engine
2016-10-24 15:20:01 -07:00
cd0bcedad7
Correct go-units import in cli/command/formatter/stats.go
...
from src/github.com/docker/go-units -> github.com/docker/go-units
Signed-off-by: Amit Krishnan <krish.amit@gmail.com >
Upstream-commit: cf8a667b8d84a596a27c51608a529115b68647cc
Component: engine
2016-10-24 15:06:58 -07:00
dee80812af
Merge pull request #26354 from KingEmet/fixbranch
...
make GetAll use client.List as the source of truth
Upstream-commit: 67b85f9d26f1b0b2b240f2d794748fac0f45243c
Component: engine
2016-10-24 14:25:24 -07:00
c42c998198
Merge pull request #26848 from miaoyq/del-a-redundant-err-return
...
Delete a redundant error return
Upstream-commit: 0ab13dda66613c403a06d69f8aff5d4b2e3b289e
Component: engine
2016-10-24 11:27:08 -07:00
efd79c3c13
Merge pull request #27578 from yuexiao-wang/update-network
...
Fix the incorrect links in the document about network and service
Upstream-commit: 96efb2cf25394b1589aced296e27f3928dc9c229
Component: engine
2016-10-24 08:05:04 -07:00
6eaaf1f7ae
Fix the incorrect links in the document about network and service
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 49e8c3d8d0c24a4a550732e4c4377646330e2e44
Component: engine
2016-10-24 22:01:38 +08:00
4e59434f98
Merge pull request #27546 from yuexiao-wang/fix-subtitle
...
Update the subtitle for stack ps
Upstream-commit: b2786a388817784e8abde3da1b67e50b58cc8b7a
Component: engine
2016-10-23 22:28:43 -07:00
c01f7998fd
Merge pull request #27660 from Microsoft/jjh/git2.10.1
...
Windows dockerfile: Changes to support git 2.10.1
Upstream-commit: 1f9beceacc916756bd5894f36306727ec9c6c008
Component: engine
2016-10-23 00:06:27 +02:00
65f0de5a38
Windows dockerfile: Changes to support git 2.10.1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 929fa9ff8075d91624a90ecaae9c1fd31e50c294
Component: engine
2016-10-22 13:07:28 -07:00
04213eed5f
Merge pull request #27616 from Microsoft/jjh/microsoftprefix
...
Windows: Overhaul Dockerfile.windows and test image name
Upstream-commit: 935d4d1c179259a262eb15fbf7e2bba2df26d740
Component: engine
2016-10-22 13:01:40 -07:00
9ef056cc6d
Merge pull request #27655 from albers/completion-exec--env
...
Fix bash completion for `docker exec --env`
Upstream-commit: daca6bacebbf098fdb84e5865c592f376691f1fd
Component: engine
2016-10-22 21:54:19 +02:00
f65987b601
Fix bash completion for docker exec --env
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 41262297416dcb007224d7d3e7e4aae19d3e9e7b
Component: engine
2016-10-22 08:14:59 -07:00
b33468451a
Merge pull request #27460 from Microsoft/jjh/dockerpid
...
Windows: Calculate PID file after root
Upstream-commit: ce6cfef36d6fa52df6ebdd3dd996d6bebe0f308d
Component: engine
2016-10-22 13:41:42 +02:00
04894a8f04
Merge pull request #27596 from aaronlehmann/rolling-restart
...
Add force option to service update
Upstream-commit: 9058ec3be5edaa313caa02371ebe7d7ac64f2faa
Component: engine
2016-10-22 13:37:12 +02:00
0e42edc6fd
Merge pull request #27630 from runcom/fix-info-route
...
api/server/router/system: fix info versioning
Upstream-commit: b54a1d83fa9ea3c1d2903138b7f9cd04f8557c20
Component: engine
2016-10-21 18:58:10 -07:00
2a18c9fa95
Merge pull request #26973 from allencloud/change-code-in-container-restore
...
change code in container restore
Upstream-commit: a6688959b4d574994f29af43d263caa83ee89ed2
Component: engine
2016-10-21 18:53:37 -07:00
50cd7220fb
Merge pull request #27640 from thaJeztah/carry-26348-update-remote-api
...
[carry 26348] Update cURL connection example in remote API reference
Upstream-commit: 064eda192e945f70c405ce537ad9f8843fb9205b
Component: engine
2016-10-21 18:17:33 -07:00
36c938c12b
Merge pull request #27117 from dnephin/swagger-gen
...
Add swagger.yaml and generate a few types from the spec
Upstream-commit: 3c385b9f6b820ae3badfbdcca589377e9a75e7fb
Component: engine
2016-10-21 18:15:28 -07:00
75231e91af
Delete a redundant error return
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
update
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: 2d126f190d5a9c07b3d3aad93244055d8c9d5fc8
Component: engine
2016-10-22 08:53:57 +08:00
39b84d5fbe
Add force option to service update
...
Currently, there's no way to restart the tasks of a service without
making an actual change to the service. This leads to us giving awkward
workarounds as in
https://github.com/docker/docker.github.io/pull/178/files , where we tell
people to scale a service up and down to restore balance, or make
unnecessary changes to trigger a restart.
This change adds a --force option to "docker service update", which
forces the service to be updated even if no changes require that.
Since rolling update parameters are respected, the user can use
"docker service --force" to do a rolling restart. For example, the
following is supported:
docker service update --force --update-parallelism 2 \
--update-delay 5s myservice
Since the default value of --update-parallelism is 1, the default
behavior is to restart the service one task at a time.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: c9fdf9abf8d6443598808809b900d96e04adfcb1
Component: engine
2016-10-21 17:43:27 -07:00
87b7e2db81
Windows: Update Dockerfile.windows
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9a19bd1b450a4f514d194d8a5571ab5be921464a
Component: engine
2016-10-21 16:06:29 -07:00
accc5bf3d7
Merge pull request #27609 from tonistiigi/fix-chroot-shared-parent
...
chroot: remount everything as private in new mntns
Upstream-commit: 87ae571fed06193a319c6776bfd19cc64067e511
Component: engine
2016-10-21 14:40:40 -07:00
d87cb9a48f
Merge pull request #27522 from vieux/data_race_plugins
...
prevent data race in pkg/plugins
Upstream-commit: d0e6dae233e0f66aa969a2ac3d28685c365cdf6c
Component: engine
2016-10-21 14:19:48 -07:00
f449f9bc63
prevent data race in pkg/plugins
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: f7af80860cf99ce808834260ac190a2a88bc24e2
Component: engine
2016-10-21 13:28:13 -07:00
871253dbbe
Update cURL example for cURL 7.40 differences
...
cURL 7.50 changed the validation for URL's
when using socket connections. cURL 7.4x
did not expect a hostname, whereas cURL
7.5x and above _requires_ a hostname.
See https://github.com/curl/curl/issues/936
This updates the example to take both
versions into account, because cURL 7.4x
is still widely used by distros.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2e0d6e6be2294ef2561e8c3b5f750fd814536268
Component: engine
2016-10-21 11:40:58 -07:00
3b96eed08f
Update docker_remote_api.md
...
See https://github.com/docker/docker/issues/26099#issuecomment-245007539
Signed-off-by: Gerwim Feiken <g.feiken@tfe.nl >
Upstream-commit: 587b186f85383f98f5475b8c16b883553299b525
Component: engine
2016-10-21 11:34:08 -07:00
bf7ee5e9d0
Merge pull request #27575 from yuexiao-wang/fix-cli-link
...
Modify the links for docker container commands
Upstream-commit: 78dae2a037e87825381ec4efb9fb47491f41e7e4
Component: engine
2016-10-21 11:15:57 -07:00
c9e05dd482
Merge pull request #27579 from albers/completion-container
...
Add bash completion for new `docker container` subcommands
Upstream-commit: 95c36b301bdbb9fe5cad3b476a8c5fb29d0cd2e4
Component: engine
2016-10-21 09:47:55 -07:00
661452cc19
Merge pull request #27405 from tonistiigi/fix-fifo2
...
Fix issues with fifos blocking on open
Upstream-commit: 32b541e44385206772b30b2a6f241a7c809aa62f
Component: engine
2016-10-21 09:44:33 -07:00
06e29a1764
Merge pull request #27490 from caarlos0/editorconfig
...
added editorconfig
Upstream-commit: 0c767f0a6ceea7b858afc5fa97f77873849fce5b
Component: engine
2016-10-21 09:15:17 -07:00
b7ec1ec845
Merge pull request #27618 from allencloud/vendor-go-units
...
revendor go-units to update more accurate duration display
Upstream-commit: 29f676564ddbfaa2b21087a8887849655e355a4e
Component: engine
2016-10-21 17:14:20 +02:00
6c03315e4f
Move bash completion logic to new subcommand: wait
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 93ccf95db1719df8127be9942db296308c33daad
Component: engine
2016-10-21 12:39:32 +02:00
b5205feca1
Move bash completion logic to new subcommand: update
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: f9a24c72bac315a03c41ad48e8073c164721e58c
Component: engine
2016-10-21 12:39:32 +02:00
cc509b2720
Move bash completion logic to new subcommand: unpause
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 6ac201721ff21425e6a6220fd166c68e34715f10
Component: engine
2016-10-21 12:39:32 +02:00
f55bd670a7
Move bash completion logic to new subcommand: top
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 4bab104761c1af134e8f098d7f2d0072bb7c64c7
Component: engine
2016-10-21 12:39:32 +02:00
a016d56d65
Move bash completion logic to new subcommand: stop
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 150dcabc0f8b4c238b4e98c015fc7373b2d293b8
Component: engine
2016-10-21 12:39:32 +02:00
a0d87aba08
Move bash completion logic to new subcommand: stats
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 19f31f8e481e00fe2f19e5341696e7f810d2bbb2
Component: engine
2016-10-21 12:39:32 +02:00
0eda6f996b
Move bash completion logic to new subcommand: start
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 2bbfd01e7a0e70fcbfdc756c393a8d8aef217d76
Component: engine
2016-10-21 12:39:32 +02:00
e43240c557
Move bash completion logic to new subcommand: run
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5200d18dbf8abf9171818db735a23f87978008bc
Component: engine
2016-10-21 12:39:32 +02:00
15649f5936
Move bash completion logic to new subcommand: rm
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9fc4670b3b1f83adc04230619c9181b7d6b4ccce
Component: engine
2016-10-21 12:39:32 +02:00
fa16e189ad
Move bash completion logic to new subcommand: restart
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 58027826d4fb1b87a59b8f1a6e2b23780f389619
Component: engine
2016-10-21 12:39:32 +02:00
0629b87f8c
Move bash completion logic to new subcommand: port
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 96547d0e88250ac009d1c73cc9b61ae88452ae27
Component: engine
2016-10-21 12:39:32 +02:00
5b1ad7b5a9
Move bash completion logic to new subcommand: port
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 48e75d4bc2cbe2bf3414613262eab0b5dc585555
Component: engine
2016-10-21 12:39:32 +02:00
507fa2bf07
Move bash completion logic to new subcommand: pause
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 27abd030591d7b5e3b9718c967ab283def411d1e
Component: engine
2016-10-21 12:39:32 +02:00
35fce53c94
Move bash completion logic to new subcommand: ps
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: a91fb558d2c7e7958baad19db0950fa6312ae47d
Component: engine
2016-10-21 12:39:32 +02:00
b52b64a1cb
Move bash completion logic to new subcommand: logs
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 4dedad31182bacde2074578e6e5520d8fb7619bb
Component: engine
2016-10-21 12:39:32 +02:00
