toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,087 Commits 3 Branches 295 Tags
c679327e8019ed4c68b1e7199eba5c9069fedca6
Commit Graph

37870 Commits

Author SHA1 Message Date
GordonTheTurtle c679327e80 Merge component 'engine' from git@github.com:moby/moby master 2018-02-22 17:06:34 +00:00
GordonTheTurtle 502470a3d8 Merge component 'cli' from git@github.com:docker/cli master 2018-02-22 16:42:28 +00:00
Sebastiaan van Stijn 34d6002b9b Merge pull request #36373 from dnephin/prepare-for-image-service 
Move daemon image code in preparation for ImageService
Upstream-commit: 867a10aadeb56a508fb7ceeee21ab1ef45a506a6
Component: engine
 2018-02-22 17:32:43 +01:00
Brian Goff 79cad3892d Merge pull request #36363 from dnephin/fix-attach-detach-test 
Fix TestAttachAfterDetach to work with latest client
Upstream-commit: c6513bd05170ad3b77def3ae50541ef50d2ad27d
Component: engine
 2018-02-22 11:25:02 -05:00
Vincent Demeester 118b6d65e2 Merge pull request #36371 from cpuguy83/bump_swarmkit 
Bump swarmkit
Upstream-commit: ffbb130873ad1aba579de7817b348b0ceacc31c2
Component: engine
 2018-02-22 12:20:42 +01:00
Vincent Demeester 9963a034b3 Merge pull request #896 from thaJeztah/templated-configs-secrets 
Add --template-driver option for secrets/configs
Upstream-commit: ef7d8be86c
Component: cli
 2018-02-22 09:44:16 +01:00
Yong Tang e6062e18f5 Merge pull request #36336 from cpuguy83/split_installers 
Split binary installers/commit scripts
Upstream-commit: 49ad3d69a7780e54ace50290d0a1a55c1182a947
Component: engine
 2018-02-21 19:20:29 -08:00
GordonTheTurtle 4b9c2900d6 Bump version to 18.04.0-ce-dev 
Signed-off-by: GordonTheTurtle <engine-team@docker.com>
 2018-02-21 23:59:05 +00:00
GordonTheTurtle 2afc089041 Merge component 'engine' from git@github.com:moby/moby master 2018-02-21 23:57:52 +00:00
GordonTheTurtle 66d22efd1f Merge component 'cli' from git@github.com:docker/cli master 2018-02-21 23:32:37 +00:00
Daniel Nephin 112db723e1 Image commit 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bad33bbd02b9f2754d3a8c64648d46baba509680
Component: engine
 2018-02-21 18:26:16 -05:00
Daniel Nephin 718daa9c98 Image events 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0ac4ad0580c48749fb7d07f60a77a0014b1c3a99
Component: engine
 2018-02-21 18:26:16 -05:00
Daniel Nephin 192d8829e0 GetLayerFolders 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f6639cb46d83cb9bb92a30578c10fdb372a58f04
Component: engine
 2018-02-21 18:26:16 -05:00
Daniel Nephin 4811cada93 Move ImagePrune 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9c25df0fa201279f78d555c91ae000cc4f9b3036
Component: engine
 2018-02-21 18:26:16 -05:00
Daniel Nephin 02638eae1b Merge pull request #36209 from dnephin/fix-image-prune-mapping 
Remove broken container check from image prune
Upstream-commit: 05c751b1be6785b4f8a42c412e858508b137c10e
Component: engine
 2018-02-21 18:22:51 -05:00
Sebastiaan van Stijn acea77d537 Merge pull request #843 from sepich/docs-for-pr33130 
Document long form of --network and --network-add
Upstream-commit: 84c7dd6057
Component: cli
 2018-02-21 23:26:39 +01:00
Sebastiaan van Stijn 3b6356337c Add --template-driver option for secrets/configs 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: d11b5ccdfa
Component: cli
 2018-02-21 23:22:32 +01:00
Brian Goff c5a1aa150e Bump swarmkit 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: be713ec486090db312f9a83481a2c4663d473f71
Component: engine
 2018-02-21 16:08:32 -05:00
Brian Goff f11213a800 Split binary installers/commit scripts 
Originally I worked on this for the multi-stage build Dockerfile
changes. Decided to split this out as we are still waiting for
multi-stage to be available on CI and rebasing these is pretty annoying.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b529d1b0936b90ae14d584c73f7332919f8d76b7
Component: engine
 2018-02-21 15:39:24 -05:00
Sebastiaan van Stijn c3a24a0fbd Update authors 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: fb005971c2bd82de482d1cfe924f2f4ec60c60ae
Component: engine
 2018-02-21 21:12:31 +01:00
Sebastiaan van Stijn da1330b479 Update authors 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ec92c08874
Component: cli
 2018-02-21 20:53:40 +01:00
Joffrey F 86c5b9760f Fix typo in 3.6 schema ID 
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 56f26d1134
Component: cli
 2018-02-21 19:55:12 +01:00
Michael Crosby ff7653434c Merge pull request #36368 from justincormack/maskkeys 
Add /proc/keys to masked paths
Upstream-commit: 8f6a40a3f126ae1dc0a74dc612a3f7b14de4e7f6
Component: engine
 2018-02-21 13:48:19 -05:00
Daniel Nephin da2e766ea9 Merge pull request #824 from ethan-haynes/820-bind-mount-source-missing-error 
added check for empty source in bind mount
Upstream-commit: cea4d37bca
Component: cli
 2018-02-21 13:33:24 -05:00
Daniel Nephin 6e4091ce84 Merge pull request #894 from thaJeztah/update-moby 
Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541
Upstream-commit: a160ad89c9
Component: cli
 2018-02-21 13:15:58 -05:00
Sebastiaan van Stijn 8254c65c9b Bump moby to 0ede01237c9ab871f1b8db0364427407f3e46541 
Includes:

- [client] Remove duplicate NewClient functions
- Add API support for templated secrets and configs
- Adjust minimum API version for templated configs/secrets

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 60930d309c
Component: cli
 2018-02-21 18:48:42 +01:00
Vincent Demeester 239936c7e1 Simplify the marshaling of compose types.Config 
- Add `Version` to `types.Config`
- Add a new `Services` types (that is just `[]ServiceConfig`) and add
  `MarshalYAML` method on it.
- Clean other top-level custom marshaling as `Services` is the only one
  required.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: cf86a4d922
Component: cli
 2018-02-21 18:47:10 +01:00
GordonTheTurtle 83cba78175 Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master 2018-02-21 17:06:09 +00:00
GordonTheTurtle b9bcfd701b Merge component 'engine' from git@github.com:moby/moby master 2018-02-21 17:06:03 +00:00
Daniel Nephin 912355fce6 Merge pull request #891 from vdemeester/k8s-loader-make-sure-version 
Make sure we marshall version too…
Upstream-commit: 939938b976
Component: cli
 2018-02-21 11:45:14 -05:00
GordonTheTurtle 3bdf2c5c9a Merge component 'cli' from git@github.com:docker/cli master 2018-02-21 16:41:14 +00:00
Justin Cormack 87cd2bf7ea Add /proc/keys to masked paths 
This leaks information about keyrings on the host. Keyrings are
not namespaced.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: de23cb939858a66829d5b75057c7ac664c5acda5
Component: engine
 2018-02-21 16:23:34 +00:00
Vincent Demeester 3ed0ebb0b5 Make sure we marshall version too… 
… otherwise the k8s controller might fail to parse the file as it will
think it's version 1.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 9f9f1c8515
Component: cli
 2018-02-21 15:36:51 +01:00
Sebastiaan van Stijn e09ff74ed5 Adjust minimum API version for templated configs/secrets 
Also adds a note to the API version history

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a3efeaad529b945ce5af78c4b08a6ed47399f8d5
Component: engine
 2018-02-21 15:23:00 +01:00
Sebastiaan van Stijn 40a7a5b6d7 Bump default API version to 1.37 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 453f2b8b40b923862ce1c08c11531ff5042770f1
Component: engine
 2018-02-21 15:22:40 +01:00
Sebastiaan van Stijn a196815f55 Merge pull request #33702 from aaronlehmann/templated-secrets-and-configs 
Templated secrets and configs
Upstream-commit: 0076343b29f508a5deb06861c0d85748659f8881
Component: engine
 2018-02-21 13:39:10 +01:00
Sebastiaan van Stijn 0308ec9c17 Merge pull request #34899 from dnephin/fix-duplicate-new-client 
[client] Remove duplicate NewClient functions
Upstream-commit: 466cc981433e2e1815a64ee714b1c8c083765785
Component: engine
 2018-02-21 12:59:42 +01:00
Sebastiaan van Stijn ad01430349 Merge pull request #35829 from cpuguy83/no_private_mount_for_plugins 
Perform plugin mounts in the runtime
Upstream-commit: 20028325daab4fcbee9c8e28f43dbfb2b1c5d568
Component: engine
 2018-02-21 12:28:13 +01:00
Sebastiaan van Stijn 692373dbbd Merge pull request #35898 from javabrett/docs-contributing-test 
test.md improvements and corrections
Upstream-commit: 9f68f20faecfc084343dc1a6cbd7de1db616e7e0
Component: engine
 2018-02-21 09:32:15 +01:00
Wataru Ishida 894af8d548 Support SCTP port mapping 
Signed-off-by: Wataru Ishida <ishida.wataru@lab.ntt.co.jp>
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 995006c164
Component: cli
 2018-02-21 12:19:38 +09:00
Daniel Nephin 143dde6783 Fix TestAttachAfterDetach to work with latest client 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 847b610620a8b8294d61c717d3c4aa13cb7a8b33
Component: engine
 2018-02-20 18:34:25 -05:00
Daniel Nephin 10bf273bff Remove explicit DOCKER_API_VERSION from integration env setup 
Use the default version because it is used by the client package

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e73d742cd7deee396eac3c97664b40264ee358cb
Component: engine
 2018-02-20 17:27:28 -05:00
Daniel Nephin 49adb54d71 Remove duplicate calls for getting an APIClient 
Remove request.SockRequest
Remove request.SockRequestHijack
Remove request.SockRequestRaw()
Remove deprecated ParseHost
Deprecate and unexport more helpers

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 0a91ba2d8cfe16df0ba37c1e283c8e3dbbb086d4
Component: engine
 2018-02-20 17:27:24 -05:00
Brian Goff 4b504a390c Merge pull request #874 from dnephin/replace-go-bindata 
Replace go-bindata with esc
Upstream-commit: 5730ef8ea0
Component: cli
 2018-02-20 17:00:22 -05:00
Brian Goff e0869be245 Cleanup volume plugin test with bad assumptions 
Test made some bad assumptions about on-disk state of volume data.
This updates the test to only test based on what the volume API is
designed to provide.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 0df654f3d61d8691ee113a8429bcc8ef65786bc7
Component: engine
 2018-02-20 16:57:20 -05:00
Kir Kolyshkin 088ad71eb5 integration/testUpdateCPUQuota: fix name 
The function name should be TestUpdateCPUQuota and not TestUpdateCPUQUota.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: 31825081d4c5e643a150b515547cb2a2ea223de4
Component: engine
 2018-02-20 13:36:27 -08:00
Kir Kolyshkin 133cf88cac integration/TestUpdateMemory: fix false failure 
This fixes the following test failure:

> --- FAIL: TestUpdateMemory (0.53s)
>  	assertions.go:226:
>	Error Trace:	update_linux_test.go:52
>	Error:      	Not equal:
>	            	expected: int(524288000)
>	            	received: int64(524288000)

Fixes: 0f9da07b569f0d9
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Upstream-commit: cc866470981a1e6a839004f24eb30bb708078068
Component: engine
 2018-02-20 13:31:03 -08:00
Daniel Nephin 180ce35066 Improve docstrings and small cleanup in client 
Use client instead of helpers for TLS in integration test

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a68ae4a2d95b1ff143025a435195af0f1ab30ace
Component: engine
 2018-02-20 15:15:02 -05:00
Daniel Nephin 9a83d9fd53 Use gotestyourself env patching 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 2b445a53c17ae6526c11a729cb6d1d1dc57490ff
Component: engine
 2018-02-20 15:15:02 -05:00
Corbin 18043a7a58 Remove ubuntu-zesty from the default BUILD_PKGS in Makefile 
Zesty is EOL and doesn't even have a subdirectory in the `deb` directory of this repo. There's no need to have it as a default.

Signed-off-by: Corbin <corbin.coleman@docker.com>
Upstream-commit: 9b3e8f85f039dfe7391512de6143ef213574973a
Component: packaging
 2018-02-20 11:29:11 -08:00