toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
29,572 Commits 3 Branches 295 Tags
c6dacdbe655869c4d9ce5f05b4191f58c4092263
Commit Graph
29572 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Demeester c6dacdbe65 Merge pull request #29096 from cyli/fix-swarmjoinpromote-test 
Fix DockerSwarmSuite.TestSwarmJoinPromoteLocked flakiness
Upstream-commit: 67131bde6d6e5511ce76b0e1dafdbe7293eaa1ab
Component: engine
 2016-12-06 10:19:36 +01:00
Sebastiaan van Stijn cb41d4ee32 Merge pull request #29162 from friism/patch-8 
Windows: make.ps1 - remove bonus whitespace
Upstream-commit: b4618baf68d6db22313a30a985501c61c7dc0b1e
Component: engine
 2016-12-06 10:18:42 +01:00
Akihiro Suda 7eb856b2dd Merge pull request #28939 from duglin/HideDupWarnings 
Only show global warnings once
Upstream-commit: e8a2c7196a2715c318bbfb2b57076fa1922a245f
Component: engine
 2016-12-06 16:12:34 +09:00
Akihiro Suda 67570c96fa Merge pull request #29136 from cpuguy83/pkgcache_use_volume 
Use named volumes for docker pkg cache
Upstream-commit: 268991a9f52557a922d41c98de6d72c9d084a9d6
Component: engine
 2016-12-06 14:26:10 +09:00
Michael Friis f9e126f19d remove bonus whitespace 
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 8d47858f96c7ef03a9d3543e0994119390acb1bb
Component: engine
 2016-12-05 20:21:25 -08:00
zhangxianwei b729d1ae5d Fix typo in integration-cli (#29160) 
Signed-off-by: xianwei <xianwei.zw@alibaba-inc.com>
Upstream-commit: 2dfb57b6706daee8e0855319bc2b121bf970267a
Component: engine
 2016-12-05 22:23:41 -05:00
Brian Goff 655301f8a7 Use named volumes for docker pkg cache 
Changes the default when incremental build is enabled to use named
volumes instead of bindmounts.
The reason for this is, on Mac/Windows the bind mounts will go over the
shared fs, which is incredibly slow and itself uses lots of CPU.

Makes an incremental build on OSX go from ~40s to 10s.

To get the old behavior, can set `PKGCACHE_DIR=.go-pkg-cache`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: c9623d1b7619dfffe01fa47b4338637945c1a53f
Component: engine
 2016-12-05 20:42:08 -05:00
Brian Goff 983cf6d582 Merge pull request #29123 from vdemeester/29116-compose-to-swarm-logging 
Handle logging in compose to swarm
Upstream-commit: 1f09d68a6e98b8b20ff4e877835bc798cfdb0100
Component: engine
 2016-12-05 20:39:08 -05:00
Victor Vieux 7eaf67346f Merge pull request #29082 from runcom/fix-rpm-buildtime 
hack/make.sh: fix BUILDTIME
Upstream-commit: 29e728e9b2a088a8b7845db397ea2f51dc2554d8
Component: engine
 2016-12-05 16:31:29 -08:00
cyli 690bfc6638 In DockerSwarmSuite.TestSwarmJoinPromoteLocked, actually wait for the node to 
finish being demoted before restarting it and ensuring it isn't locked anymore
to reduce test flakiness.

Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: e831a7cdb7a2e60f38e6de8a5e6be4d681181f42
Component: engine
 2016-12-05 13:21:27 -08:00
Tibor Vass 3c2896d350 Merge pull request #28963 from vieux/refactor_plugin_install 
refactor plugin install
Upstream-commit: 1c96879f1e99efc881aaa3480bc6aab18d233475
Component: engine
 2016-12-05 12:00:29 -08:00
Brian Goff 50e3fb21f3 Merge pull request #29117 from AkihiroSuda/vendor-swarmkit 
[master] Vendor swarmkit
Upstream-commit: 04cd1990b47d51559a7df0a8437ec84764109288
Component: engine
 2016-12-05 14:11:21 -05:00
Vincent Demeester 4b08621474 Merge pull request #29134 from unclejack/gofmt_fixes 
api/types/container,client: gofmt
Upstream-commit: ac9226d8435316f45c123b51b9dad4da4d02ad81
Component: engine
 2016-12-05 19:26:25 +01:00
Sebastiaan van Stijn ca7a3bb94d Merge pull request #29115 from andrewhsu/fix-vim-install 
run dnf upgrade before installing in fedora
Upstream-commit: 6a8156d646a36982d54d8d33c4002b0312375050
Component: engine
 2016-12-05 19:05:14 +01:00
Daniel Nephin 2ce7163e6e Merge pull request #29121 from AkihiroSuda/fix-it-bundle 
Fix bundle dir for integration-cli
Upstream-commit: 86faf137f98d95d441843d96d98f1451ca8d4b45
Component: engine
 2016-12-05 10:50:29 -05:00
unclejack a7d2aca6a3 api/types/container,client: gofmt 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: c1ce63b17bde361107900d7b58da6d13fd309734
Component: engine
 2016-12-05 17:00:36 +02:00
Vincent Demeester 4ef31d0696 Handle logging in compose to swarm 
Logging configuration was completely ignore when deploy a compose file
to swarm. This fixes it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 806cc1e0f815d7c4e4b7bd4fa537e3d4c3535e23
Component: engine
 2016-12-05 15:18:36 +01:00
Sebastiaan van Stijn f1e558901f Merge pull request #29111 from albers/fix-completion-service-create-update 
Fix bash completion for `docker service create|update
Upstream-commit: 2ef729460d756f5a49e63096c93d858ae8f7e38b
Component: engine
 2016-12-05 15:16:23 +01:00
Brian Goff b37431fe09 Merge pull request #29109 from albers/completion-secrets 
Add bash completion for secret management
Upstream-commit: 602efb0cabeca0567551b950b0cac21e8caeb7cd
Component: engine
 2016-12-05 09:13:26 -05:00
Vincent Demeester b2c4cb4b33 Merge pull request #29113 from albers/completion-version--format 
Add bash completion for `docker version --format`
Upstream-commit: f7862482ce466e29e180fd460384ae11d3fe4975
Component: engine
 2016-12-05 11:47:24 +01:00
Akihiro Suda ba5cfa2cc3 Fix bundle dir for integration-cli 
test.main was unexpectedly created under docker/integration-cli/bundles/VERSION/test-integration-cli directory.
This commit moves test.main to docker/bundles/VERSION/test-integration-cli.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 4522f14f8cd0d51ced18c24e0d7929409b82a212
Component: engine
 2016-12-05 09:07:38 +00:00
Akihiro Suda f6ae1b2ad9 Vendor swarmkit 
Update swarmkit to deec7ba2c4ef48f20ebe9674afbcced606a5339e, from the master branch.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 7375507eeae61cfb5e93f074235320687595b07d
Component: engine
 2016-12-05 04:56:40 +00:00
Anusha Ragunathan 4d3934c3e5 Merge pull request #28967 from yongtang/28946-support-plugin-docker-inspect 
Support plugin type in `docker inspect`
Upstream-commit: 24ffa2fa7751e2f1fbdd7e0d5a640f24e8a5b803
Component: engine
 2016-12-04 18:30:38 -08:00
Andrew Hsu e4ea064d47 run dnf upgrade before installing in fedora 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: ebd804bfb6af27b04514512676619b6a961551dc
Component: engine
 2016-12-04 16:29:03 -08:00
Harald Albers ec683949ea Add bash completion for docker version --format 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3d43c48c1bbb8eaa2be4ec0d6203183b0f55b9d9
Component: engine
 2016-12-04 14:13:14 -08:00
Harald Albers a51412a45d Fix bash completion for `docker service create|update 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: be5685e4bffc88a6cd3a093ee883c5335758266d
Component: engine
 2016-12-04 12:11:33 -08:00
Harald Albers e66fab77ad Add bash completion for secret management 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 324dd3cfec756109df58128376b888684d8cf521
Component: engine
 2016-12-04 11:25:41 -08:00
Sebastiaan van Stijn 53a14ce389 Merge pull request #29106 from chrisgavin/docs-spelling-fix 
Fix a spelling mistake in the docs.
Upstream-commit: eab3711999f776356861d08312ab2fc141b63faf
Component: engine
 2016-12-04 14:17:27 +01:00
Chris Gavin 9c58790379 Fix a spelling mistake in the docs. 
Signed-off-by: Chris Gavin <chris@chrisgavin.me>
Upstream-commit: 35c82f422d5db64baec6739490900f7f8fa7d7fd
Component: engine
 2016-12-04 12:55:00 +00:00
Sebastiaan van Stijn 957b4580ef Merge pull request #29098 from DieterReuter/add-support-for-qemu-builds 
Add support for running builds within an QEMU emulation
Upstream-commit: d80fd833e70985361b4c9c020966f98c19f43698
Component: engine
 2016-12-03 23:25:46 +01:00
Dieter Reuter beb7c759eb Add support for running builds within an QEMU emulation 
With this change we can run a Docker build in QEMU and build ARM or ARM64 binaries directly on an Intel build machine. This feature already supports building with Docker4Mac (Beta31). So it's easy for a developer to compile and test the Docker binaries locally on his dev machine w/o the need of the target hardware. Another use case would be to run builds on a clound CI like Travis to get an instant feedback loop for PR's, all on a common Intel platform w/o the need to set up the CI system on the target hardware.

Usage: build static Docker binaries for ARM 32-bit
```
DOCKER_ENGINE_OSARCH="linux/arm" make binary
```

Usage: build static Docker binaries for ARM64 aka AARCH64
```
DOCKER_ENGINE_OSARCH="linux/arm64" make binary
```

Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
Upstream-commit: 0d7e118f0199102924c318c80b7e7a10720e1874
Component: engine
 2016-12-03 13:53:59 +01:00
Antonio Murdaca ed70bdfd73 hack/make.sh: fix BUILDTIME 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 7b1f77dcbc4c7cda754613f424f937056d3206ec
Component: engine
 2016-12-03 09:09:41 +01:00
Brian Goff c0aa09b760 Merge pull request #28988 from vdemeester/28985-dont-validate-hostname 
Remove hostname validation as it seems to break users
Upstream-commit: 3cb310c21049f652dd00d20899cb1ece1ee9aa8f
Component: engine
 2016-12-02 21:16:56 -05:00
Sebastiaan van Stijn 30839117e7 Merge pull request #28735 from yongtang/28708-plugin-list-id 
Add `ID` field for `docker plugin ls`
Upstream-commit: 51c5718aa357d3319f579caa39d313e4d55ff794
Component: engine
 2016-12-03 02:37:09 +01:00
Tibor Vass cc93b75a69 Merge pull request #29064 from vdemeester/29005-revert-builder-comments-line 
Revert "Fix dockerfile parser with empty line after escape"
Upstream-commit: 6dff86f8b342c92e7686673fece7f31adf1bf836
Component: engine
 2016-12-02 17:11:18 -08:00
Sebastiaan van Stijn 095013e19b Merge pull request #28349 from allencloud/add-missing-code-in-api-docs 
add missing status code of swarm cluster in api 1.24
Upstream-commit: 535db46be508d38a6f9f304a4e57e0c3d1c94af1
Component: engine
 2016-12-03 02:04:05 +01:00
Victor Vieux 791ab405b2 update docs 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 30db51c169497f6d1f6d9517f25c237dd61182de
Component: engine
 2016-12-02 15:24:11 -08:00
Victor Vieux a9f58f81fd refactor plugin install 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: fa3b61a28f55d84afbbb978785ce9632123d12fa
Component: engine
 2016-12-02 15:23:08 -08:00
Victor Vieux 6be6989ae5 Merge pull request #28994 from cpuguy83/allow_vol_recreate_for_same_driver 
Fix out-of-band vol delete+create for same driver
Upstream-commit: 42aafe725ff20c6a97f7e4e06b3ec5ee9e615fb3
Component: engine
 2016-12-02 15:12:13 -08:00
Arnaud Porterie 961c833b2d Merge pull request #29090 from vieux/update_poule_config 
update poule.yml
Upstream-commit: 07489b8e79158f9d6dddbcb04cba87ff414f3d4b
Component: engine
 2016-12-02 15:06:26 -08:00
Sebastiaan van Stijn 40bdf9e61c Merge pull request #28964 from Microsoft/jjh/make 
Windows: make.ps1 and dockerfile for native builds
Upstream-commit: ab56641ab5ee3fc7815f7f60a4d55c5b93295441
Component: engine
 2016-12-02 23:56:42 +01:00
Victor Vieux fa830dbed4 update poule.yml 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: d2920bb31127aa83c8cd0c0534131342fd592406
Component: engine
 2016-12-02 14:54:34 -08:00
Yong Tang eaac95defc Add ID field for docker plugin ls 
This fix tries to address the enhancement proposed in 28708 to display
ID field for the output of `docker plugin ls`.

This fix add `ID` field to the output of `docker plugin ls`

Related docs has been updated.

This fix fixes 28708.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 8a226ed6432a0614b25298fef872c98794f65ba9
Component: engine
 2016-12-02 13:42:50 -08:00
Alexander Morozov 34d513c5af Merge pull request #29075 from cpuguy83/29070_fix_tmpfs_opts 
Fix issue where TmpfsOptions are not sent to swarm
Upstream-commit: 0fb0d67008157add34f1e11685e23a691db92644
Component: engine
 2016-12-02 13:40:20 -08:00
Yong Tang 8d0b8ac112 Support plugins in docker inspect 
This fix tries to address the proposal raised in 28946
to support plugins in `docker inspect`.

The command `docker inspect` already supports
"container", "image", "node", "network", "service", "volume", "task".
However, `--type plugin` is not supported yet at the moment.

This fix address this issue by adding the support of `--type plugin`
for `docker inspect`.

An additional integration test has been added to cover the changes.

This fix fixes 28946.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 90bb2cdb9f15a9b1b9a4e2ea4242882665daac4e
Component: engine
 2016-12-02 11:33:29 -08:00
Brian Goff 789d09669e Merge pull request #29077 from dnephin/fix-swagger-gen-validate 
Fix swagger-gen validation
Upstream-commit: bed5a0bc2c972243205cf18f30389d47a31537c0
Component: engine
 2016-12-02 14:08:46 -05:00
John Howard 05a05baa0e Windows: make.ps1 and Dockerfile for native builds 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 155435b6ceeb05b2927ecc726216666b898b6459
Component: engine
 2016-12-02 10:46:15 -08:00
Brian Goff 9a6dc26e71 Merge pull request #29069 from vdemeester/29031-manpages-buildarg 
Use DOCKER_BUILD_ARGS on manpages make target
Upstream-commit: fddb5a7f2ab29be441bc797f7e79fffc5cc531d3
Component: engine
 2016-12-02 12:30:36 -05:00
Alexander Morozov 653a60cf01 Merge pull request #29039 from thaJeztah/fix-restart-limit-validation 
Fix restartpolicy max-retry validation
Upstream-commit: 6e023ac7486edf7a2584cb918249b7e5fdaf91d2
Component: engine
 2016-12-02 09:19:54 -08:00
Daniel Nephin 7c952889cb Merge pull request #29071 from bfirsh/29045-use-singular-tag-names-in-swagger 
Use singular tag names in swagger.yaml
Upstream-commit: 334366cdd9b9366f1a0e77d8bb6d41b1884bbfa2
Component: engine
 2016-12-02 12:13:20 -05:00