GordonTheTurtle
f2d857fcec
Merge component 'cli' from git@github.com:docker/cli master
2018-03-27 16:41:30 +00:00
Sebastiaan van Stijn
610793fe1f
Merge pull request #561 from tych0/deprecate-unencrypted-storage
...
Deprecate unencrypted storage
Upstream-commit: e6e47d95b5
Component: cli
2018-03-27 14:52:03 +02:00
Sebastiaan van Stijn
e985ce6103
Merge pull request #941 from dnephin/fix-compose-network-name
...
Fix compose network name
Upstream-commit: 236a84759a
Component: cli
2018-03-26 23:41:44 +02:00
Daniel Nephin
ee50259e4c
Merge pull request #931 from dnephin/refactor-build-unit-tests
...
Refactor build tests to re-use more code and not require root
Upstream-commit: d3efe30878
Component: cli
2018-03-26 14:44:13 -04:00
Daniel Nephin
5d37083ce3
Refactor build tests to re-use more code and not require root
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0f1bb35342
Component: cli
2018-03-26 14:27:52 -04:00
GordonTheTurtle
286d3fed3d
Merge component 'engine' from git@github.com:moby/moby master
2018-03-26 17:06:55 +00:00
GordonTheTurtle
36283420d9
Merge component 'cli' from git@github.com:docker/cli master
2018-03-26 16:41:30 +00:00
Vincent Demeester
72976c8bb6
print a big warning about cleartext passwords
...
Signed-off-by: Tycho Andersen <tycho@docker.com >
Upstream-commit: 4290df3958
Component: cli
2018-03-26 16:18:32 +02:00
Sebastiaan van Stijn
6b1c8c09b1
Merge pull request #962 from davidjb/run-docs
...
Clarify behaviour of restart policy in run ref doc
Upstream-commit: db11cffe37
Component: cli
2018-03-26 13:14:44 +01:00
Sebastiaan van Stijn
e222bd5a48
Merge pull request #943 from silvin-lubecki/fix-kubernetes-published-service
...
Fix docker stack services command Port output
Upstream-commit: 27f66e39f4
Component: cli
2018-03-26 12:50:07 +01:00
Sebastiaan van Stijn
95b93fdfcd
Merge pull request #36692 from katakonst/unique_names_container_rename_Test
...
Use unique names for container/rename_test.go
Upstream-commit: 7cfd3f4229c82ba61fa13a8818b8ecf58a2dcdbf
Component: engine
2018-03-26 11:29:01 +01:00
Sebastiaan van Stijn
8590eff8c7
Merge pull request #36694 from thaJeztah/update-ripcurld-handle
...
Update curators list
Upstream-commit: e5eb527ebd773ed3e40fcb0d2b74a37ab807d777
Component: engine
2018-03-26 11:13:58 +01:00
Akihiro Suda
2f8d388ea0
Merge pull request #36646 from anusha-ragunathan/err_return
...
Add missing error return for plugin creation.
Upstream-commit: 6b3f66c4188b573534a6887668b9fb213cc489e9
Component: engine
2018-03-26 18:34:47 +09:00
Sebastiaan van Stijn
744fc0b049
Update curators list
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: c85ee9828cb718f2ef83ee3876cef46b9eb3b82c
Component: engine
2018-03-26 10:39:52 +02:00
Catalin Pirvu
d1631a824d
Use unique names for container/rename_test.go
...
Signed-off-by: Catalin Pirvu <pirvu.catalin94@gmail.com >
Upstream-commit: 90b514922bb6405bc06428702b1a55bb248bdac3
Component: engine
2018-03-25 21:16:32 +03:00
David Beitey
40d437f5bc
Clarify behaviour of restart policy in run ref doc
...
This clarifies that the behaviour of `unless-stopped` will restart the container on daemon start. This was implied before, but now the restart-on-daemon-start behaviour is mentioned directly.
Signed-off-by: David Beitey <david@davidjb.com >
Upstream-commit: 8ca237054f
Component: cli
2018-03-26 00:21:40 +10:00
GordonTheTurtle
6c4f2b4ad2
Merge component 'engine' from git@github.com:moby/moby master
2018-03-24 17:06:16 +00:00
Anusha Ragunathan
e3d080dac1
Add missing error return for plugin creation.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com >
Upstream-commit: 89a882e2f1706e567a8514209701892b40da7a62
Component: engine
2018-03-23 12:07:43 -07:00
Sebastiaan van Stijn
6b1f053c14
Merge pull request #36672 from anshulpundir/election
...
Increase raft ElectionTick to 10xHeartbeatTick
Upstream-commit: 5f17312653c3e4dc5474f86692b09f06262a1ebd
Component: engine
2018-03-23 19:57:24 +01:00
GordonTheTurtle
65c691f4bb
Merge component 'engine' from git@github.com:moby/moby master
2018-03-23 17:06:08 +00:00
GordonTheTurtle
32d715f231
Merge component 'cli' from git@github.com:docker/cli master
2018-03-23 16:41:26 +00:00
Sebastiaan van Stijn
160d042de0
Merge pull request #35149 from AkihiroSuda/image-v1
...
image/spec: add historical information about v1 spec
Upstream-commit: 2e3056128cc839b5fdee8edeb651f4ecc244db78
Component: engine
2018-03-23 16:47:16 +01:00
Vincent Demeester
e1bf73660b
Merge pull request #953 from silvin-lubecki/fix-docker-version-kubernetes
...
Fix Kubernetes duplication in version command
Upstream-commit: c3991d0673
Component: cli
2018-03-23 15:59:37 +01:00
Silvin Lubecki
86110646cc
Fix Kubernetes duplication in version command when the server already exposes one Kubernetes component
...
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com >
Upstream-commit: 54bb5ffeca
Component: cli
2018-03-23 15:52:25 +01:00
Sebastiaan van Stijn
38f9066976
Merge pull request #36676 from arm64b/enable-criu-on-non-arm64-v2
...
Enable CRIU on non-amd64 architectures (v2)
Upstream-commit: 52d3dceac548e70ad9cebc4c755adc2c0774dc11
Component: engine
2018-03-23 13:05:45 +01:00
Vincent Demeester
dd8e748718
Merge pull request #36509 from xujihui1985/master
...
fix(distribution): digest cache should not be moved if it was an auth
Upstream-commit: c3b3be529693316412111e81860ba293a3668f0f
Component: engine
2018-03-23 11:17:43 +01:00
Dennis Chen
2bc1fa895f
Remove the uname -m in Dockerfile
...
Using `dpkg --print-architecture` instead of the `uname -m` to abstract
the architecture value from the container images, which the build process
is running inside, to match exactly the behavior specified by the following
Docker file while not 'passthru' to the host.
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 803a756941f5e4b68429a3642d52585c8ea6dbaa
Component: engine
2018-03-23 08:56:35 +00:00
Dennis Chen
985dd23e4a
Enable CRIU on non-amd64 architectures
...
Since the recent release of CRIU has already supported other
arches such as AArch64, ppc64le, and s390x, so we can enable
it now.
Signed-off-by: Dennis Chen <dennis.chen@arm.com >
Upstream-commit: 7fd54a7a48f9f1bb2b28144e38c886d1fe813a04
Component: engine
2018-03-23 05:52:35 +00:00
Akihiro Suda
5656978b1e
Merge pull request #36662 from adshmh/use-unique-resource-names-for-container-inspect-ps-stop-integration-tests
...
Use unique names for test resources of container/inspect, container/ps, container/stop tests
Upstream-commit: 57c504799d979caa706142e6f5dc4be4a5b1e3e2
Component: engine
2018-03-23 12:16:53 +09:00
Anshul Pundir
de2245153e
Increase raft ElectionTick to 10xHeartbeatTick
...
Signed-off-by: Anshul Pundir <anshul.pundir@docker.com >
Upstream-commit: 6abee2008b314a65553202b15d9a333d171e3433
Component: engine
2018-03-22 15:04:10 -07:00
Sebastiaan van Stijn
780a0b27cc
Merge pull request #36670 from stevvooe/use-context-error
...
daemon: use context error rather than inventing new one
Upstream-commit: 766d9edf39b79e11018bb0f55056b5bd915ddf3c
Component: engine
2018-03-22 20:45:20 +01:00
Vincent Demeester
9b231b4ae9
Merge pull request #959 from vdemeester/help-use-available-flags
...
Use HasAvailableFlags instead of HasFlags for Options in help
Upstream-commit: a6d235430a
Component: cli
2018-03-22 19:13:26 +01:00
Sebastiaan van Stijn
14f21513ed
Merge pull request #957 from thaJeztah/docs-touch-ups
...
Docs touch-ups for "autoremove" and broken anchor
Upstream-commit: ad4fe148d6
Component: cli
2018-03-22 18:26:45 +01:00
GordonTheTurtle
5fd56df388
Merge component 'engine' from git@github.com:moby/moby master
2018-03-22 17:07:05 +00:00
Stephen J Day
f358bd4b47
daemon: use context error rather than inventing new one
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: d84da75f01e0a0d20fbddb8b051a325e3b21eded
Component: engine
2018-03-22 09:38:59 -07:00
Vincent Demeester
10376dc96a
Merge pull request #36663 from tonistiigi/hijackconn-fix
...
client: fix hijackedconn reading from buffer
Upstream-commit: 69091990c72f3a3a6143fe6417a769e7a1a1ff1a
Component: engine
2018-03-22 17:10:06 +01:00
Vincent Demeester
4758c92085
Use HasAvailableFlags instead of HasFlags for Options in help
...
> HasAvailableFlags checks if the command contains any flags (local
> plus persistent from the entire structure) which are not hidden or
> deprecated.
This fix the `--help` display when the `Options` is empty (but
showing), like on `docker trust key`
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 66fdd085a5
Component: cli
2018-03-22 15:24:31 +01:00
Vincent Demeester
1f699969f9
Merge pull request #36587 from justincormack/unpriv-caps
...
If container will run as non root user, drop permitted, effective caps early
Upstream-commit: b67c1e078c7eeb20199dce301e95fa8999c98109
Component: engine
2018-03-22 14:51:29 +01:00
Sebastiaan van Stijn
34dd223936
Merge pull request #36647 from adshmh/use-unique-names-for-container-nat-test-containers
...
use unique names for test containers of container/nat integration tests
Upstream-commit: 00c59ed77e186b6f9056bb8e0a2700767b4be383
Component: engine
2018-03-22 14:03:36 +01:00
Sebastiaan van Stijn
3db81e37ca
Merge pull request #36172 from kolyshkin/systemd-memlimit
...
Test for systemd cgroupdriver memory setting
Upstream-commit: e2bede01e4a6a6f84e33e2a6debf2cfed5938828
Component: engine
2018-03-22 13:36:43 +01:00
Akihiro Suda
2748b681fe
Merge pull request #36653 from thaJeztah/refactor-windows-service-code
...
Split daemon service code to _windows file
Upstream-commit: 3baa5889592894a9d39938aa8fdf08e879cb8a25
Component: engine
2018-03-22 21:14:17 +09:00
Vincent Demeester
082579ff1b
Merge pull request #36551 from selansen/36247
...
Fix for Flaky test TestServiceWithPredefinedNetwork
Upstream-commit: cd01c147b1c4b483a75f02de9c9c8416bc8d9ac2
Component: engine
2018-03-22 10:01:20 +01:00
Tonis Tiigi
4ad54eacb8
client: fix hijackedconn reading from buffer
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f094a05e260d8748f0fd2018a8a908b4189e454d
Component: engine
2018-03-21 15:29:44 -07:00
Arash Deshmeh
809b43730d
use unique names for resources used by integration tests container/inspect_test, container/ps_test, container/stop_test
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 78e4be91332e2237c0fa14eb3ba0fb5b915c3256
Component: engine
2018-03-21 17:47:49 -04:00
Sebastiaan van Stijn
e2458dab76
Docs touch-ups for "autoremove" and broken anchor
...
`--rm` moved to the daemon, so is now also supported
when combined with `-d`.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e9ce688d6e
Component: cli
2018-03-21 19:00:11 +01:00
GordonTheTurtle
ea449e9b10
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2018-03-21 17:05:32 +00:00
GordonTheTurtle
0545caf82a
Merge component 'engine' from git@github.com:moby/moby master
2018-03-21 17:05:26 +00:00
GordonTheTurtle
f1b44852ef
Merge component 'cli' from git@github.com:docker/cli master
2018-03-21 16:41:19 +00:00
selansen
f95a3e7bb8
Fix for Flaky test TestServiceWithPredefinedNetwork
...
TestServiceWithPredefinedNetwork test case was failing
at times. To fix the issue, added new API to check
for services after we clean up all services. Tested
multiple times and this sould fix flaky issue.
Signed-off-by: selansen <elango.siva@docker.com >
Upstream-commit: dabffd806c98ab13dbc25e57bee21c5291b9a50c
Component: engine
2018-03-21 11:49:23 -04:00
Vincent Demeester
48f3c4dac0
Merge pull request #955 from dnephin/remove-filewatcher
...
Remove filewatcher
Upstream-commit: c1b58a9096
Component: cli
2018-03-21 14:31:26 +01:00