Vincent Demeester
b4098a4e18
Merge pull request #34968 from chris-crone/integration-test-docker-ee
...
Docker EE integration test fixes
Upstream-commit: 147443a42665419d8b3c2047a7d345440bfb63c0
Component: engine
2017-09-26 10:50:09 +02:00
Vincent Demeester
48757849a4
Merge pull request #34946 from dnephin/fix-jsonlog
...
Move pkg/jsonlog to be a subpackage of the single consumer
Upstream-commit: 7d47823c22945bb24a609a7ef20c0559d78d96e4
Component: engine
2017-09-26 10:49:57 +02:00
Boaz Shuster
ec4868350d
Add an integration test for bug #31392 regression
...
This verifies that bug #31392 won't surface again.
To reproduce the bug:
1) docker run -dit --name a0 busybox sh
2) docker run -dit --name b0 --link a0 busybox sh
3) docker rename a0 a1
4) docker run -dit --name a0 busybox sh
5) docker rm -f b0
6) docker run -dit --name b0 --link a0 busybox sh
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: 48a26ba9e42f25ebc1ad732b4c0d31e77a7aaa55
Component: engine
2017-09-26 10:55:59 +03:00
Vincent Demeester
fa79e0059e
Merge pull request #34943 from tonistiigi/vendor-buildkit
...
vendor: update buildkit to aaff9d591
Upstream-commit: 4d48baacde3dd6bb9e4c4f8ef1319765ded031f4
Component: engine
2017-09-26 08:37:46 +02:00
Vincent Demeester
3366e8951a
Merge pull request #34965 from vdemeester/fix-pkg-mount-unit-test-under-selinux
...
Fix TestMount under a selinux system
Upstream-commit: 41313c87a25aec122fb43fdaf2433d1b121f1808
Component: engine
2017-09-26 08:37:22 +02:00
yangchenliang
401172966f
"docker swarm init --force-new-cluster" use limit
...
Signed-off-by: yangchenliang <yangchenliang@huawei.com >
When worker executor `docker swarm init
--force-new-cluster`,docker would hang.So only manager can process it.
Signed-off-by: yangchenliang <yangchenliang@huawei.com >
Upstream-commit: 12e947efdba5481020f6543514ade83d87c69a28
Component: engine
2017-09-26 12:05:19 +08:00
Victor Vieux
1608188995
Merge pull request #472 from riyazdf/docker-trust
...
docker trust: view, revoke, sign subcommands (experimental)
Upstream-commit: af3cdccf52
Component: cli
2017-09-25 17:26:52 -07:00
Daniel Nephin
f367f50630
Move jsonlog to a subpackage of jsonfilelog
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 035604cca6d6bd9a432268caf7515a35023908ed
Component: engine
2017-09-25 16:07:25 -04:00
Daniel Nephin
7d644fb209
Fix benchmarks and remove more unnecessary code.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a06ad2792ab92d4f246e4b4cc4c3529eb060651e
Component: engine
2017-09-25 16:07:25 -04:00
Daniel Nephin
4701b66889
Remove unused JSONLog marshaling
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 231c5cbd50e1870f31eb6a525b2df2ed7a716565
Component: engine
2017-09-25 16:07:25 -04:00
Daniel Nephin
a001c9d5c7
Remove unused Format
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 638d4cc7e4390ab217be711913017b22ce2cd5c2
Component: engine
2017-09-25 16:07:25 -04:00
Daniel Nephin
0c6f170345
Unexport FastTimeMarshalJSON
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7de92de636ef307d66b7b20b24f166a47f40f72b
Component: engine
2017-09-25 16:07:25 -04:00
Daniel Nephin
101f740d40
Move RFC3339NanoFixed to a more appropriate package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 27cfa68af16721c978803c3b695bcc7181ccc721
Component: engine
2017-09-25 16:07:24 -04:00
Darren Stahl
658351133f
Fix error string about containers feature
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 31405b556f155d8f56902086c7c24efe25dd8de0
Component: engine
2017-09-25 12:39:27 -07:00
Darren Stahl
3c4574bac3
Ensure Host Network Service exists
...
If HNS does not exist on the Docker host, the daemon may fail with unexpected
and difficult to diagnose errors. This check prevents the daemon from starting
on a system that does not have the correct prerequisites.
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 1edcc63560cb1286f452565754092bc2eb428ffa
Component: engine
2017-09-25 11:07:44 -07:00
Joao Fernandes
025e41d2ae
Add note about joining through a load balancer
...
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com >
Upstream-commit: 8595d15d60
Component: cli
2017-09-25 10:53:20 -07:00
Riyaz Faizullabhoy
702bac1553
mark command as experimental in docs and cli
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: e07f345267
Component: cli
2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
e0bca90fda
trust: rename inspect to view, add repo name to signer table header
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: c6db0cd7a1
Component: cli
2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
94f2b59302
tests: use alice/bob/claire conventional names for signers
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 46a879e3b9
Component: cli
2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
188ec7af2a
trust: update remove to error on empty references for consistency
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 4e95fcd72c
Component: cli
2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
a59fc63f3b
tests: move trust test to proper package
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 67cf09cbe1
Component: cli
2017-09-25 09:39:46 -07:00
Riyaz Faizullabhoy
7c83ece8ef
trust: update reference type and use golden output
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 4e89dc800a
Component: cli
2017-09-25 09:39:44 -07:00
Riyaz Faizullabhoy
1659928f34
tests: address review feedback
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 6fca400f1e
Component: cli
2017-09-25 09:38:41 -07:00
Riyaz Faizullabhoy
51f87f33d4
trust: use mock CLI for testing offline
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: f667bd7559
Component: cli
2017-09-25 09:38:40 -07:00
Riyaz Faizullabhoy
93ba24cc42
cli: introduce NotaryClient getter
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: e5c35ab9d1
Component: cli
2017-09-25 09:38:38 -07:00
Riyaz Faizullabhoy
b53048a314
trust: add Repository client interface
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 7c5b836ca5
Component: cli
2017-09-25 09:34:54 -07:00
Riyaz Faizullabhoy
e42a2df102
trust: address review feedback, refactor to align with existing cli/command semantics
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 45c102a03d
Component: cli
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
e92c4686dd
docs: update docker trust docs with correct tense and formatting
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 007aff70bf
Component: cli
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
97f2ec42fa
trust revoke: docs for docker trust revoke
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 43717a866e
Component: cli
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
e8d4ecb361
trust revoke: add docker trust revoke command
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 609f8b4b81
Component: cli
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
ad5c7cb4bb
trust sign: docs for docker trust sign
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: bc665ed762
Component: cli
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
644ae3a3f1
trust sign: add docker trust sign command
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: fab6bb6798
Component: cli
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
1115dc5cef
trust inspect: docs for docker trust inspect
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 809ef0fd74
Component: cli
2017-09-25 09:34:53 -07:00
Riyaz Faizullabhoy
530ee183f1
trust inspect: add docker trust inspect command with formatting print
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: ec6bc9460f
Component: cli
2017-09-25 09:34:52 -07:00
Riyaz Faizullabhoy
742798f154
trust: update existing code for new vendoring, refactor for docker trust code sharing
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 5846e6e5d5
Component: cli
2017-09-25 09:34:52 -07:00
Riyaz Faizullabhoy
86beae9d05
vendor: upgrade notary version for docker trust
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: fb1cbaeb66
Component: cli
2017-09-25 09:34:52 -07:00
Christopher Crone
0975184f91
Docker EE integration test fixes
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 8c5f98c93e06de81b7fb6416372a3f42aa7aeb5d
Component: engine
2017-09-25 18:09:19 +02:00
Sebastiaan van Stijn
0c54b3a041
Improve error message for COPY missing destination
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 5d05a8291314b8f727b04b504b8d7fc7ed7f42da
Component: engine
2017-09-25 14:17:18 +02:00
Christopher Crone
522e6cc8ec
Do not use deprecated call for APIClient
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 82440a039f58b6a1487f8042486fe8dba675df54
Component: engine
2017-09-25 14:08:03 +02:00
Christopher Crone
0b2721b9c1
Protect environment for system integration tests
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: d43dac2202667a407f4c5ab061c04b0ea334aa20
Component: engine
2017-09-25 14:05:18 +02:00
Christopher Crone
e38ecccceb
Match not implemented error check to others
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: 7406088853b6cbcb8996c367062cee2e1ee6eaaa
Component: engine
2017-09-25 13:58:51 +02:00
Akihiro Suda
954a7de027
Dockerfile: use seccomp provided by stretch
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 1b51a05375b48c5f655fbbedc5a1e7cba044122c
Component: engine
2017-09-25 10:03:37 +00:00
Vincent Demeester
08619d0c7c
Fix TestMount under a selinux system
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8bebd42df2d8eaa0ecdc9c78bc1e395a752eb5c9
Component: engine
2017-09-25 11:54:30 +02:00
Vincent Demeester
5c2be22475
Merge pull request #307 from allencloud/sort-secrets-and-configs-in-cli
...
using nature sort secrets and configs in cli
Upstream-commit: bd6e1757f5
Component: cli
2017-09-25 09:41:50 +02:00
allencloud
fdeab20153
sort secrets and configs in cli
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com >
Upstream-commit: 26f06c5bcb
Component: cli
2017-09-25 13:18:13 +08:00
Flavio Crisciani
28762b7242
Vendoring libnetwork
...
Fix for networkDB garbage collection (PR: https://github.com/docker/libnetwork/pull/1944 )
Added extra logs to monitor the netowrkDB status and number of entries per network
Signed-off-by: Flavio Crisciani <flavio.crisciani@docker.com >
Upstream-commit: 04043428ea5ce679618aec2007b77ac51d0b6af0
Component: engine
2017-09-24 16:44:16 -07:00
Brian Goff
0f097012c8
Merge pull request #546 from dnephin/fix-version-on-failure
...
Set APIVersion on the client, even when Ping fails
Upstream-commit: a41caadef0
Component: cli
2017-09-23 09:04:03 -04:00
Brian Goff
753a551b2e
Merge pull request #552 from allencloud/volume-has-no-id
...
remove volume id because it only has name
Upstream-commit: 29c4f0df57
Component: cli
2017-09-23 08:58:37 -04:00
Allen Sun
a0ff43ff51
remove volume id because it only has name
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com >
Upstream-commit: fe1c1b6b5c
Component: cli
2017-09-23 11:26:56 +08:00
Daniel Nephin
f3a4b20d25
Use a local constant
...
This constant is going to be removed from jsonlog package.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 32612058cb
Component: cli
2017-09-22 17:59:46 -04:00