f99bd6dc82
Merge component 'engine' from git@github.com:moby/moby master
2017-09-26 12:50:25 -07:00
1a654751d3
Merge component 'cli' from git@github.com:docker/cli master
2017-09-26 10:56:04 -07:00
7fd47ecc0d
Merge pull request #34961 from fcrisciani/libnetwork-vendoring
...
Vendoring libnetwork
Upstream-commit: 37eb796ccb6de7def92f0ab3f18c686ae92ef29f
Component: engine
2017-09-26 10:50:32 -07:00
09b100cab2
Merge pull request #34973 from darrenstahlmsft/fixError
...
Fix error string about containers feature
Upstream-commit: 9feef9287474d0e9afe489d9ad0b71a986a012cb
Component: engine
2017-09-26 18:44:12 +02:00
6424aeb9fa
Merge pull request #34918 from thaJeztah/update-copy-add-error
...
Improve error message for COPY missing destination
Upstream-commit: 76b5ab6f43aeffe4261e2b1f848476d36d332880
Component: engine
2017-09-26 18:43:36 +02:00
57c6d20473
Merge pull request #34358 from ripcurld0/fix_link_problem
...
Add an integration test for bug #31392 regression
Upstream-commit: 584ed9603b4cb79160d0dd8689cdbbdedb9fe00f
Component: engine
2017-09-26 18:41:08 +02:00
e3c3856028
Merge pull request #34908 from thaJeztah/bump-api-version-1.33
...
Bump API version to 1.33
Upstream-commit: 74a084162ce544fe995715ba47aa84d3d75b95c1
Component: engine
2017-09-26 18:09:50 +02:00
399de7ee20
Merge pull request #551 from dnephin/set-local-constant
...
Use a local constant
Upstream-commit: 0856c20e04
2017-09-26 17:42:50 +02:00
57dd97eab1
Merge pull request #555 from joaofnfernandes/docs/advertise-addr
...
Add note about joining through a load balancer
Upstream-commit: b77f3fd5ac
2017-09-26 17:15:42 +02:00
671d46ed3d
Merge pull request #34983 from thaJeztah/suppress-tmp-rename-warning
...
Suppress warning for renaming missing tmp directory
Upstream-commit: 65234597216d03866bc26bdad06cb1f25f832206
Component: engine
2017-09-26 16:53:28 +02:00
9e59512fe4
Merge pull request #451 from tych0/use-pass-backend
...
Use pass backend
Upstream-commit: be8dab26a3
2017-09-26 16:40:32 +02:00
1fe51e0bb7
document the pass backend and default behavior
...
Also add a big warning about cleartext passwords.
Signed-off-by: Tycho Andersen <tycho@docker.com >
Upstream-commit: a2f116733b
2017-09-26 08:31:02 -06:00
cbf8cc6faf
Suppress warning for renaming missing tmp directory
...
When starting `dockerd` on a host that has no `/var/lib/docker/tmp` directory,
a warning was printed in the logs:
$ dockerd --data-root=/no-such-directory
...
WARN[2017-09-26T09:37:00.045153377Z] failed to rename /no-such-directory/tmp for background deletion: rename /no-such-directory/tmp /no-such-directory/tmp-old: no such file or directory. Deleting synchronously
Although harmless, the warning does not show any useful information, so can be
skipped.
This patch checks thetype of error, so that warning is not printed.
Other errors will still show up:
$ touch /i-am-a-file
$ dockerd --data-root=/i-am-a-file
Unable to get the full path to root (/i-am-a-file): canonical path points to a file '/i-am-a-file'
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 2b50b14aebc12722f81db8d8f66415e1fa7b954a
Component: engine
2017-09-26 12:04:30 +02:00
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
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
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
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
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
1608188995
Merge pull request #472 from riyazdf/docker-trust
...
docker trust: view, revoke, sign subcommands (experimental)
Upstream-commit: af3cdccf52
2017-09-25 17:26:52 -07:00
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
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
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
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
0c6f170345
Unexport FastTimeMarshalJSON
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7de92de636ef307d66b7b20b24f166a47f40f72b
Component: engine
2017-09-25 16:07:25 -04:00
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
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
025e41d2ae
Add note about joining through a load balancer
...
Signed-off-by: Joao Fernandes <joao.fernandes@docker.com >
Upstream-commit: 8595d15d60
2017-09-25 10:53:20 -07:00
702bac1553
mark command as experimental in docs and cli
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: e07f345267
2017-09-25 09:39:46 -07:00
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
2017-09-25 09:39:46 -07:00
94f2b59302
tests: use alice/bob/claire conventional names for signers
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 46a879e3b9
2017-09-25 09:39:46 -07:00
188ec7af2a
trust: update remove to error on empty references for consistency
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 4e95fcd72c
2017-09-25 09:39:46 -07:00
a59fc63f3b
tests: move trust test to proper package
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 67cf09cbe1
2017-09-25 09:39:46 -07:00
7c83ece8ef
trust: update reference type and use golden output
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 4e89dc800a
2017-09-25 09:39:44 -07:00
1659928f34
tests: address review feedback
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 6fca400f1e
2017-09-25 09:38:41 -07:00
51f87f33d4
trust: use mock CLI for testing offline
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: f667bd7559
2017-09-25 09:38:40 -07:00
93ba24cc42
cli: introduce NotaryClient getter
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: e5c35ab9d1
2017-09-25 09:38:38 -07:00
b53048a314
trust: add Repository client interface
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 7c5b836ca5
2017-09-25 09:34:54 -07:00
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
2017-09-25 09:34:53 -07:00
e92c4686dd
docs: update docker trust docs with correct tense and formatting
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 007aff70bf
2017-09-25 09:34:53 -07:00
97f2ec42fa
trust revoke: docs for docker trust revoke
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 43717a866e
2017-09-25 09:34:53 -07:00
e8d4ecb361
trust revoke: add docker trust revoke command
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 609f8b4b81
2017-09-25 09:34:53 -07:00
ad5c7cb4bb
trust sign: docs for docker trust sign
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: bc665ed762
2017-09-25 09:34:53 -07:00
644ae3a3f1
trust sign: add docker trust sign command
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: fab6bb6798
2017-09-25 09:34:53 -07:00
1115dc5cef
trust inspect: docs for docker trust inspect
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: 809ef0fd74
2017-09-25 09:34:53 -07:00
530ee183f1
trust inspect: add docker trust inspect command with formatting print
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: ec6bc9460f
2017-09-25 09:34:52 -07:00
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
2017-09-25 09:34:52 -07:00
86beae9d05
vendor: upgrade notary version for docker trust
...
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com >
Upstream-commit: fb1cbaeb66
2017-09-25 09:34:52 -07:00
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
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
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
