GordonTheTurtle
e812a9de38
Merge component 'cli' from git@github.com:docker/cli master
2018-04-20 16:41:35 +00:00
Sebastiaan van Stijn
4e1a92ff17
Merge pull request #1013 from thaJeztah/update-authors
...
Update AUTHORS and mailmap
Upstream-commit: 6c9232a568
Component: cli
2018-04-18 13:46:30 -07:00
Brian Goff
4d4ddfe510
Merge pull request #1012 from thaJeztah/add-silvin-maintainer
...
Add Silvin as maintainer
Upstream-commit: 01778ee9d5
Component: cli
2018-04-18 16:35:40 -04:00
Sebastiaan van Stijn
05bd043eba
Update AUTHORS and mailmap
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a761eff8c5
Component: cli
2018-04-18 13:31:07 -07:00
Sebastiaan van Stijn
a013bf96ca
Add Silvin as maintainer
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 60b371506c
Component: cli
2018-04-18 13:21:33 -07:00
GordonTheTurtle
4d42b1eabb
Merge component 'engine' from git@github.com:moby/moby master
2018-04-18 17:05:51 +00:00
Vincent Demeester
de82b21350
Merge pull request #1004 from albers/completion--template-driver
...
Add bash completion for `secret|config create --template-driver`
Upstream-commit: 0685bb29db
Component: cli
2018-04-18 19:04:29 +02:00
GordonTheTurtle
c3b2dee6b3
Merge component 'cli' from git@github.com:docker/cli master
2018-04-18 16:41:26 +00:00
Vincent Demeester
a90ad7bf98
Merge pull request #36832 from vdemeester/integration-daemon-api-helpers
...
More integration-cli/integration refactoring + request package
Upstream-commit: 25ff68a80f315a5e0a4526cc15a1ece83843ae2b
Component: engine
2018-04-18 16:12:14 +02:00
Brian Goff
a1bdeeb8dc
Merge pull request #36858 from j-haj/36414-standardize_build_paths
...
Standardize artefact path for all build stages
Upstream-commit: 4923f8cc639e1ab01a251429495920e516ef779f
Component: engine
2018-04-18 06:58:38 -04:00
Akihiro Suda
6f9cc3826f
Merge pull request #36880 from thaJeztah/bump-swarmkit
...
Bump SwarmKit to 9c2aa152c3054371b833483a7ddad8d15052ec4f
Upstream-commit: 5dae4828f3248d7f442c53165aa0628020c6b74e
Component: engine
2018-04-18 19:10:55 +09:00
Sebastiaan van Stijn
10b6953e20
Merge pull request #1008 from n4ss/revert-unencrypted-prompt
...
Revert unencryted storage warning prompt
Upstream-commit: 8618838bdb
Component: cli
2018-04-18 00:01:13 -07:00
Sebastiaan van Stijn
c48e2f3808
Bump SwarmKit to 9c2aa152c3054371b833483a7ddad8d15052ec4f
...
Relevant changes:
- docker/swarmkit#2551 RoleManager will remove deleted nodes from the cluster membership
- docker/swarmkit#2574 Scheduler/TaskReaper: handle unassigned tasks marked for shutdown
- docker/swarmkit#2561 Avoid predefined error log
- docker/swarmkit#2557 Task reaper should delete tasks with removed slots that were not yet assigned
- docker/swarmkit#2587 [fips] Agent reports FIPS status
- docker/swarmkit#2603 Fix manager/state/store.timedMutex
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 333b2f28fef4ba857905e7263e7b9bbbf7c522fc
Component: engine
2018-04-17 13:44:49 -07:00
Sebastiaan van Stijn
f1112e0539
Merge pull request #999 from perlun/patch-1
...
build.md: Document --build-arg without value
Upstream-commit: 771ccaf4ed
Component: cli
2018-04-17 10:39:20 -07:00
Vincent Demeester
a05c5e914a
Move integration-cli/request to internal/test/request…
...
… and change a bit the method signature
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 42f6fdf059807ecbe66cce90676021363a541154
Component: engine
2018-04-17 16:25:59 +02:00
Vincent Demeester
3d6d872b1c
Add api helpers to internal/test/daemon.Daemon
...
Porting helpers from `integration-cli/daemon.Daemon` to this struct
and use the API instead of the cli.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 9722214c8add2a83f6c4974848139cadc79d9f0e
Component: engine
2018-04-17 16:24:31 +02:00
Vincent Demeester
e20647387e
Merge pull request #36868 from vdemeester/integration-move-fake-internal
...
Move fakecontext, fakegit and fakestorage to internal/test
Upstream-commit: 648ae4979e5a44fd046c292b48a02725a16f9304
Component: engine
2018-04-17 16:23:22 +02:00
Jeff Hajewski
f4e6667402
Standardize artefact path for all build stages
...
Update all build stages to output artefacts to /build
Signed-off-by: Jeff Hajewski <jeff.hajewski@gmail.com >
Upstream-commit: 00555f7b261111084b966920da607a504b068953
Component: engine
2018-04-17 09:08:25 -05:00
Vincent Demeester
1805ce9e0e
Merge pull request #1007 from HenryNe/patch-1
...
docs: Typofix in example "docker image ls"
Upstream-commit: f3bf6928da
Component: cli
2018-04-17 10:10:19 +02:00
Vincent Demeester
a425bbca33
Move fakecontext, fakegit and fakestorage to internal/test
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 062564084a22f71cf5807ae5dfad7d29afb12e04
Component: engine
2018-04-17 09:53:09 +02:00
Sebastiaan van Stijn
b77fed9a5f
Merge pull request #36866 from fntlnz/poule-assign-pr-fntlnz
...
Add myself to poule to get 2w/old PRs
Upstream-commit: 13771fede318028d67e5d521bb97bcb54a4aaec5
Component: engine
2018-04-16 18:32:32 -07:00
Anusha Ragunathan
f4b8a312a4
Merge pull request #36841 from yongtang/02222018-tag-test
...
Migrate image tag tests from integration-cli to api tests
Upstream-commit: abb1661907fa5e831872a7f99f1af2dcc88724bf
Component: engine
2018-04-16 17:53:48 -07:00
Anusha Ragunathan
84f41cfc7e
Merge pull request #36838 from vdemeester/integration-fixtures-refactoring
...
Clean some integration-cli/fixtures package/files
Upstream-commit: f9c4e630269be438cddfe843c727c21c3343f1c2
Component: engine
2018-04-16 17:49:29 -07:00
Anusha Ragunathan
9c85effe88
Merge pull request #36854 from vdemeester/integration-swarm-more-in-internal
...
[test/integration] Small daemon refactoring and add swarm init/join helpers
Upstream-commit: c65d365eb3f98df7b10ac07b919ebaa1e4b75212
Component: engine
2018-04-16 12:49:49 -07:00
Nassim 'Nass' Eddequiouaq
46a62eba1d
Revert unencryted storage warning prompt
...
Signed-off-by: Nassim 'Nass' Eddequiouaq <eddequiouaq.nassim@gmail.com >
Upstream-commit: 3acf5d2e47
Component: cli
2018-04-16 12:48:03 -07:00
GordonTheTurtle
d87b0c1878
Merge component 'engine' from git@github.com:moby/moby master
2018-04-16 17:06:40 +00:00
Lorenzo Fontana
e26e074b4e
Add myself to poule to get 2w/old PRs
...
Signed-off-by: Lorenzo Fontana <lo@linux.com >
Upstream-commit: 691e0c06cef55a455d72a4d1ec9dc4d072cf5e3b
Component: engine
2018-04-16 18:33:21 +02:00
Henry N
8037d00abb
docker load: Typofix in examples
...
Remove the double "docker docker" from example
Signed-off-by: Henry Ne <henrynmail-github@yahoo.de >
Upstream-commit: 79c489d812
Component: cli
2018-04-16 16:39:54 +02:00
Vincent Demeester
c2c6cea1b0
Clean some integration-cli/fixtures package/files
...
- Move go package used by both `integration-cli` and `integration` to
`internal/test/fixtures`.
- Remove fixtures that are not used anymore (moved to `docker/cli` a
while ago) : deploy, notary, secrets.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5f56503f583f21d655394f755f71849381bd58c7
Component: engine
2018-04-16 10:48:58 +02:00
Vincent Demeester
bd6e299583
Small daemon refactoring and add swarm init/join helpers
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 239a8a518904dfb51fe62087d8702519c20ce808
Component: engine
2018-04-16 10:20:10 +02:00
Per Lundberg
e4e0816835
build.md: Document --build-arg without value
...
This use case is currently _working correctly_, which is nice, but there is no documentation to be found about it. This PR fixes that.
Signed-off-by: Per Lundberg <perlun@gmail.com >
Upstream-commit: 82c23208ee
Component: cli
2018-04-16 07:52:13 +03:00
Yong Tang
1b1d5ffe90
Merge pull request #36862 from yongtang/04152018-container.Create
...
Some enhancement in integration tests
Upstream-commit: ea579a6194525ce3b98eba04f74de19a106bf918
Component: engine
2018-04-15 09:12:52 -07:00
GordonTheTurtle
adaf9083e8
Merge component 'engine' from git@github.com:moby/moby master
2018-04-14 17:06:13 +00:00
Yong Tang
fe0deb4aa6
Merge pull request #36738 from Microsoft/jjh/getlayerpath
...
Windows: Add GetLayerPath implementation in graphdriver
Upstream-commit: 5c2e6064a1c5cb816081958e5a7079bc6b474940
Component: engine
2018-04-14 09:59:38 -07:00
Yong Tang
691aeed45e
Some enhancement in integration tests
...
This fix converts some `client.ContainerCreate` to `container.Create`,
and removes some unneeded `name` fields when test containers are created.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: ab9bb47b05b1dde445a5e4ba78ae97303208dc8b
Component: engine
2018-04-14 16:52:02 +00:00
GordonTheTurtle
c4b7e9df27
Merge component 'cli' from git@github.com:docker/cli master
2018-04-14 16:41:31 +00:00
Harald Albers
cf1baa9f3c
Add bash completion for secret|config create --template-driver
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 43024e2d57
Component: cli
2018-04-14 14:46:19 +02:00
Sebastiaan van Stijn
a95dfe42a3
Merge pull request #970 from cowlinator/temp2
...
Clarify --build-arg documentation
Upstream-commit: e5980c541a
Component: cli
2018-04-13 18:54:16 -07:00
Tibor Vass
566b2857cf
Merge pull request #35739 from thaJeztah/bump-go-1.10
...
Bump Golang to 1.10.1
Upstream-commit: 61138fb5fc0f5fc1799cabfa86d28fb88a0f472c
Component: engine
2018-04-13 13:56:38 -10:00
Tibor Vass
944c468f43
Merge pull request #963 from thaJeztah/fix-stack-deploy-after-force
...
Fix stack deploy re-deploying service after --force
Upstream-commit: 6b31ea0f0d
Component: cli
2018-04-13 13:06:40 -10:00
Sebastiaan van Stijn
fce8015aac
Merge pull request #36845 from medakk/refactor-daemon
...
Refactor code in cmd/dockerd/daemon.go
Upstream-commit: 3881f1a5219ba5d0a1ed54121ba20cd1700fec52
Component: engine
2018-04-13 15:26:48 -07:00
Sebastiaan van Stijn
6f1e5f20ef
Merge pull request #36839 from vdemeester/integration-registry-refactoring
...
Move and refactor integration-cli/registry to internal/test
Upstream-commit: a9f502d04b5a493904a24c173fa3d6d6b17ad740
Component: engine
2018-04-13 15:02:53 -07:00
GordonTheTurtle
f66a44c5e1
Merge component 'engine' from git@github.com:moby/moby master
2018-04-13 17:06:24 +00:00
Yong Tang
10abb9454f
Migrate image tag tests from integration-cli to api tests
...
This fix migrates image tag tests from integration-cli to api tests.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9bcb960508a6066811cffcca1e35ca44d7f1cf94
Component: engine
2018-04-13 14:46:40 +00:00
Vincent Demeester
af04bf6300
Move and refactor integration-cli/registry to internal/test
...
- Move the code from `integration-cli` to `internal/test`.
- Use `testingT` and `assert` when creating the registry.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 66de2e6e3b6d927a3396743cd7c363aa9f7b776e
Component: engine
2018-04-13 10:45:34 +02:00
Akihiro Suda
1fe7cf068a
Merge pull request #36840 from cpuguy83/bump_libnetwork
...
Bump libnetwork commit
Upstream-commit: 544ec0994f3979314b0c3a892a4e352145d0cc0b
Component: engine
2018-04-13 13:54:52 +09:00
Anusha Ragunathan
21cd6af613
Merge pull request #36778 from odg0318/master
...
Using authorization plugin, I changed Content-Type check routine.
Upstream-commit: ff6a103067dec1eec6de023ec813355c419246f6
Component: engine
2018-04-12 17:39:38 -07:00
Anusha Ragunathan
32a14263cf
Merge pull request #35831 from anusha-ragunathan/splunk_partial
...
Improve partial message support in logger
Upstream-commit: 9689059b5636f23d77cc3ac29ee41c6fabff81ec
Component: engine
2018-04-12 17:38:27 -07:00
Sebastiaan van Stijn
97ccb57a9f
Merge pull request #36727 from tiborvass/fix-master-ci-gitcommit
...
ci: quote bash variable
Upstream-commit: f238bfda902d8193dd2d33bb334cd2419ffa5578
Component: engine
2018-04-12 14:06:22 -07:00
John Stephens
3d3a3ad156
hack/make.ps1: fix Validate-PkgImports
...
In Go 1.10.1, the Deps for pkg\tarsum\tarsum_test.go are empty ([]) and
the PowerShell script ends up setting its import list to a string value
of False instead of an empty array. This can be remedied by forcing the
result to be an array, by concatenating to an empty array (@() + ...)
Signed-off-by: John Stephens <johnstep@docker.com >
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
(cherry picked from commit ec3f9230d70506c536a24e844da0f0b3af9b43f6)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: ee508d47c3917b423b6caae0ad2867c4f6ffe696
Component: engine
2018-04-12 13:37:10 -07:00