3e9857033b
Merge pull request #29149 from Microsoft/jjh/dockerfileclarification
...
Windows: Dockerfile 2GB clarification Hyper-V
Upstream-commit: 96a2d9e7d2655a8374c2bdf326cd4a7224ce34bf
Component: engine
2016-12-06 12:10:03 +01:00
767d2b0a2a
Merge pull request #29166 from allencloud/add-403-for-network-create-endpoint
...
add 403 for endpoint network create
Upstream-commit: f687eb576ff508872213b5639c3bc279db5e6852
Component: engine
2016-12-06 11:47:28 +01:00
00e81acaa1
Merge pull request #29073 from adshmh/28756-print-checkpoint-name-in-checkpoint-create-command
...
Print checkpoint id when creating a checkpoint
Upstream-commit: 7f9ba93914a5b9fff7c21cc5cb19de90a9190f35
Component: engine
2016-12-06 11:06:29 +01:00
9603ca0d08
Merge pull request #28896 from yongtang/28884-secret-name-mask-ID
...
Fix issue where secret ID is masked by name
Upstream-commit: 57d77cc205768624c36b4bd7fb98d9924925087e
Component: engine
2016-12-06 11:05:30 +01:00
92a14fe836
Merge pull request #28535 from yongtang/28497-prune-until
...
Convert DanglingOnly to Filters for `docker image prune`
Upstream-commit: 745795ef2e0089c5001e5a2fc7ba8c1ab0234857
Component: engine
2016-12-06 11:03:45 +01:00
050e2993f5
Merge pull request #28974 from AkihiroSuda/test-service-logs
...
improve TestServiceLogs for the goroutine issue #28915
Upstream-commit: 08f0100d5025e32d1392fab3493d5c0436ccdd2c
Component: engine
2016-12-06 10:58:57 +01:00
8be5282fae
Merge pull request #29159 from Microsoft/jjh/bumpgit
...
Windows: Bump to latest version of git
Upstream-commit: 8326dcd2af04338cf6e56285f42bf8530ccb1274
Component: engine
2016-12-06 10:30:33 +01:00
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
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
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
13d5eb7768
add 403 for endpoint network create
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 0d21e24b9fb90ea804ba37af303de7547743ba2b
Component: engine
2016-12-06 14:36:50 +08:00
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
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
cc8d5c0801
improve TestServiceLogs for the goroutine issue #28915
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: f8a93d0c9d157dddc4e4d4d9c43a6fe7c7c0c242
Component: engine
2016-12-06 03:44:49 +00:00
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
a6482c217b
Windows: Bump to latest version of git
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8a45eea2ddac40c907feb38859eb056a4d0024cc
Component: engine
2016-12-05 18:40:31 -08:00
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
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
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
bb56a95461
Windows: Dockerfile 2GB clarification Hyper-V
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f7b4d6544506f882f3168ab6a2ccb75f0ad0794e
Component: engine
2016-12-05 14:01:17 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
085088f73e
Fix issue where secret ID is masked by name
...
This fix tries to address the issue in 28884 where
it is possible to mask the secret ID by name.
The reason was that searching a secret is based on name.
However, searching a secret should be done based on:
- Full ID
- Full Name
- Partial ID (prefix)
This fix addresses the issue by changing related implementation
in `getCliRequestedSecretIDs()`
An integration test has been added to cover the changes.
This fix fixes 28884
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 3638ca4d14bcca9bc924f21314e4a1020cd5172f
Component: engine
2016-12-02 20:24:29 -08:00
35037b78fd
Convert DanglingOnly to Filters for docker image prune
...
This fix convert DanglingOnly in ImagesPruneConfig to Filters,
so that it is possible to maintain API compatibility in the future.
Several integration tests have been added to cover changes.
This fix is related to 28497.
A follow up to this PR will be done once this PR is merged.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: a6be56b54e871c4e7a6e72881770a64676c27c3c
Component: engine
2016-12-02 20:08:49 -08:00
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
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
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
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
791ab405b2
update docs
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 30db51c169497f6d1f6d9517f25c237dd61182de
Component: engine
2016-12-02 15:24:11 -08:00
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
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
