Commit Graph
36884 Commits
Author SHA1 Message Date
Daniel Nephin 5a9c815672 Remove cli/command/credentials
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 4ae4e66e3c
Component: cli
2016-09-09 15:50:01 -04:00
Daniel Nephin 4d7122f63b Remove cli/command/credentials
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e05fa5de480b7bf4c16df1624f85ecf96a42b3f7
Component: engine
2016-09-09 15:50:01 -04:00
Daniel Nephin b9ca23a598 Remove RetrieveAuthConfigs
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: ed55f00674
Component: cli
2016-09-09 15:50:01 -04:00
Daniel Nephin bfc42c3a59 Remove RetrieveAuthConfigs
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 5d335fbda7d32f06c8b3080a79018b9585cb83f1
Component: engine
2016-09-09 15:50:01 -04:00
Stephen J Day 291889bdac tlsconfig: move Clone into proper package
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: c6f96cb8b4
Component: cli
2016-09-09 12:05:17 -07:00
Stephen J Day b73e4afba2 tlsconfig: move Clone into proper package
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 9d7be9df8f79b26a4b9778851cf19a6579f8bc61
Component: engine
2016-09-09 12:05:17 -07:00
allencloud d47523d4c5 support docker node ps multiNodes
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 6df46463a9
Component: cli
2016-09-10 02:52:48 +08:00
allencloud 69668dcc9a support docker node ps multiNodes
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: af4461ad290d660acab5ef87b96e392263cc7cb9
Component: engine
2016-09-10 02:52:48 +08:00
John Howard e66566fbee Windows: Fix regression pulling linux images
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8437d0a3298abf8bf3632a2764b945956ece422f
Component: engine
2016-09-09 11:40:34 -07:00
Charles Smith 5ae8996c81 add swarm mode terms to the glossary
Signed-off-by: Charles Smith <charles.smith@docker.com>
Upstream-commit: 498f18de26cb8142323c64683699d9e6f10946ea
Component: engine
2016-09-09 11:18:30 -07:00
Phil Estes 32b3a84313 Merge pull request #22049 from boucher/docker-checkpoint-restore
Implement containerd API for checkpoints
Upstream-commit: cf58eb437c4229e876f2d952a228b603a074e584
Component: engine
2016-09-09 13:36:55 -04:00
Phil Estes e71d793ff1 Merge pull request #22049 from boucher/docker-checkpoint-restore
Implement containerd API for checkpoints
Upstream-commit: 5fe882a494
Component: cli
2016-09-09 13:36:55 -04:00
Phil Estes c9069cbf6e Remove --read-only restriction when user ns enabled
The restriction is no longer necessary given changes at the runc layer
related to mount options of the rootfs. Also cleaned up the docs on
restrictions left for userns enabled mode. Re-enabled tests related to
--read-only when testing a userns-enabled daemon in integration-cli.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 6062ae5742e49ec1a79073c327f3d1343c218a12
Component: engine
2016-09-09 13:23:41 -04:00
root 6bdcfc529e Vendor libnetwork @51d88e9ae63f
- Fixes #26440

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Upstream-commit: 7d8048de06d6074dc83c973a48c1e1a1b60704b6
Component: engine
2016-09-09 18:57:15 +02:00
Daniel Nephin fcbd8b4fb4 Merge pull request #26443 from dnephin/move_trust_client
Move image trust related cli methods into the image package
Upstream-commit: 81090c945515066681ac7fd195660e8a28247007
Component: engine
2016-09-09 12:29:28 -04:00
boucher f1d86422d0 Update checkpoint comments to be more accurate
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 67f607a02f8e86586f3984c7fd24961deba29b8b
Component: engine
2016-09-09 12:13:46 -04:00
boucher e0e6966e2d Update checkpoint comments to be more accurate
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 272868566b
Component: cli
2016-09-09 12:13:46 -04:00
John Howard 9c73c5a62a Merge pull request #26438 from lixiaobing10051267/masterSystem
docker daemon requires windows version info while low build
Upstream-commit: 704049a6914b1fa38199bf8dc38af761eb3e7f2d
Component: engine
2016-09-09 09:12:47 -07:00
Michael Crosby 5c50f1d40b Merge pull request #26428 from darrenstahlmsft/AddToSymlink
Don't attempt to evaluate drive root on Windows
Upstream-commit: c1f2776bf1e8997e44d3c244e99104b3511b7255
Component: engine
2016-09-09 09:09:24 -07:00
lixiaobing10051267 54ffd0826e Specify the required version while the version not support daemon
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: b4b9efd4c515601c60439b146a603fe17fa823fb
Component: engine
2016-09-09 23:04:45 +08:00
Daniel Nephin bea6567477 Move image trust related cli methods into the image package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0cf85349f3
Component: cli
2016-09-09 10:50:16 -04:00
Daniel Nephin 30f4e29669 Move image trust related cli methods into the image package.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e7c9694d76390e9f8a0d1ec3f54c2eda632b3759
Component: engine
2016-09-09 10:50:16 -04:00
Brian Goff 8a99df66fe Merge pull request #26432 from stevvooe/dont-hide-context-errors
client: don't hide context errors
Upstream-commit: 89bc5d54ca09573378616c4ee0000bb370d27aec
Component: engine
2016-09-09 08:53:43 -04:00
Justin Cormack e8f53d8ee7 Merge pull request #26424 from michael-holzheu/PR-s390x-bump-to-binary-go-1-7-1
Dockerfile.s390x: Use binary go package
Upstream-commit: 7c118f40cb96f8eb112c89d2d517252dff791c5f
Component: engine
2016-09-09 09:53:02 +01:00
boucher 820ac3028c Update containerd to fix unkillable restored containers.
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 6bc9a2d563ace9fa604de15731e263b353e83120
Component: engine
2016-09-08 21:31:56 -04:00
boucher 46699a2a41 Fix typo
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 9524caa317
Component: cli
2016-09-08 21:31:56 -04:00
boucher 982e83123e Fix the clashing route syntax for checkpoint/container delete.
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 0dfbf960d72fc3f7deec02cc3f36385361216794
Component: engine
2016-09-08 21:31:56 -04:00
boucher 86bd90005f Fix typo
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: cb0ad4258b4c9615a16960c2a6125d2c40896d3b
Component: engine
2016-09-08 21:31:56 -04:00
boucher cef9a66721 Initial implementation of containerd Checkpoint API.
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: f0647193dc
Component: cli
2016-09-08 21:31:52 -04:00
boucher 7bef93723c Initial implementation of containerd Checkpoint API.
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: d8fef66b03c1ea8715470690efbd950033f7f628
Component: engine
2016-09-08 21:31:52 -04:00
Yong Tang 9c57f9b583 Restrict size to 2 fractional digits for docker images
This fix tries to address the issue raised in 26300. Previously
`docker images` will use `HumanSize()` to display the size which
has a fixed precision of 4 (thus 3 fractional digits). This
could be problematic in certain languages (e.g. , German, see
26300) as `.` may be interpreted as thousands-separator in number.

This fix use `CustomSize()` instead and limit the precision to 3
(thus 2 fractional digits).

This fix has been tested manually.

This fix fixes 26300.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c68bb57959
Component: cli
2016-09-08 18:26:50 -07:00
Yong Tang b896a9dba6 Revendor go-units to f2145db703495b2e525c59662db69a7344b00bb8
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 6866fda800ab9adb9a88b60f6660b512401c921f
Component: engine
2016-09-08 18:26:50 -07:00
Yong Tang 5a872990c6 Restrict size to 2 fractional digits for docker images
This fix tries to address the issue raised in 26300. Previously
`docker images` will use `HumanSize()` to display the size which
has a fixed precision of 4 (thus 3 fractional digits). This
could be problematic in certain languages (e.g. , German, see
26300) as `.` may be interpreted as thousands-separator in number.

This fix use `CustomSize()` instead and limit the precision to 3
(thus 2 fractional digits).

This fix has been tested manually.

This fix fixes 26300.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 4e7e3919cedd2ba6ec5b9a4deb4cab56be460c23
Component: engine
2016-09-08 18:26:50 -07:00
Stephen J Day 92630b8067 client: don't hide context errors
Instead of reformatting error from the request action, we wrap it,
allowing the cause to be recovered. This is important for consumers that
need to be able to detect context errors, such as `Cancelled` and
`DeadlineExceeded`.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 450b3123e3
Component: cli
2016-09-08 17:47:43 -07:00
Stephen J Day 015d80b443 client: don't hide context errors
Instead of reformatting error from the request action, we wrap it,
allowing the cause to be recovered. This is important for consumers that
need to be able to detect context errors, such as `Cancelled` and
`DeadlineExceeded`.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 8e5ef8af5c90a3fbc93173cb485d42e044ca56ae
Component: engine
2016-09-08 17:47:43 -07:00
Michael Crosby 1d1f2eb8d2 Merge pull request #26422 from dnephin/move_api_client
Move api/client -> cli/command
Upstream-commit: e345d67c4e2862d497ec92640fd00bf04e6b696e
Component: engine
2016-09-08 16:44:49 -07:00
Justin Cormack e2b900a8b1 Merge pull request #26375 from cpuguy83/fix_apt_mirror_propagation
Propagate BUILD_APT_MIRROR and consume in buil-deb
Upstream-commit: da7a7f9b769f6c1ccc88526390a3ff6528e31eb9
Component: engine
2016-09-09 00:02:42 +01:00
Darren Stahl 4e9c99c3b4 Don't attempt to evaluate drive root on Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: fdce2a7775ec80d769f585c0a400c6cf6615776b
Component: engine
2016-09-08 13:52:54 -07:00
Daniel Nephin b924adb986 Fix a test that expects whitespace at the end of the line.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e2f7387906
Component: cli
2016-09-08 15:50:14 -04:00
Daniel Nephin 623bb6a4a8 Fix a test that expects whitespace at the end of the line.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 485881b038eea7b1cee7f94f1e20e4cd3be85c0c
Component: engine
2016-09-08 15:50:14 -04:00
Daniel Nephin bc178aeaa8 Replace api/client imports with cli/command in experimental files.
Using

git grep -l 'client\.DockerCli' cli/command/stack/ | xargs sed -i -e 's/client\.DockerCli/command\.Dockercli/g'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 8f3e3fb6e5
Component: cli
2016-09-08 15:46:48 -04:00
Daniel Nephin 0238cc6815 Replace api/client imports with cli/command in experimental files.
Using

git grep -l 'client\.DockerCli' cli/command/stack/ | xargs sed -i -e 's/client\.DockerCli/command\.Dockercli/g'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9c2b9358125175db366ca000e6dae9af8dc88e2d
Component: engine
2016-09-08 15:46:48 -04:00
Daniel Nephin a5bf28b72a Move api/client -> cli/command
Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: b2c77abc35
Component: cli
2016-09-08 15:46:29 -04:00
Daniel Nephin 964a552e76 Move api/client -> cli/command
Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 3bd1eb4b76
Component: cli
2016-09-08 15:46:29 -04:00
Daniel Nephin d8acc366ce Move api/client -> cli/command
Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0640a14b4fcba3715f7cc3bc9444f3c7f4827edd
Component: engine
2016-09-08 15:46:29 -04:00
Brian Goff 5f9cd25fac Merge pull request #26406 from AkihiroSuda/fix-make-manpages
client: transport: fix tlsconfig Clone() on different Golang versions
Upstream-commit: 93e8aff1bc4a91e0cfdfd0974b4e68d43cc78006
Component: engine
2016-09-08 15:37:54 -04:00
Alexander Morozov 0b990a4b09 Merge pull request #26107 from dnephin/client_cleanup
Shrink the DockerCLI type
Upstream-commit: d959e7fac4345762d26083a5d694871377f6dc75
Component: engine
2016-09-08 12:18:46 -07:00
Richard Mathie 3ad3cbeebe Update service_create.md
More info on endpoint setting, and service discovery on swarm mode overlay network.

Signed-off-by: Richard Mathie <richard.mathie@amey.co.uk>
Upstream-commit: 21a9c64b77bd10969dde7376060d5750c6b65aac
Component: engine
2016-09-08 12:11:48 -07:00
Michael Crosby bbc0d92cc4 Merge pull request #26423 from AkihiroSuda/md2man106-1
update go-md2man to v1.0.6
Upstream-commit: 46d2256370221086e7ba9d1e85b2d56cb4aa7099
Component: engine
2016-09-08 11:38:29 -07:00
Michael Crosby 574f281ca0 Merge pull request #26224 from q384566678/test-zhou
Modify rename function use tips
Upstream-commit: 061cc417591217c4bcf735267c2de18f2a8189c0
Component: engine
2016-09-08 11:22:21 -07:00