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
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
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
Yong Tang
278bf3cb85
Merge pull request #34929 from stevvooe/remove-promise-package
...
pkg/package: remove promise package
Upstream-commit: c982ee805d895a4fc2bf01f2d1d8afa06b408dd0
Component: engine
2017-09-22 11:52:23 -07:00
Tonis Tiigi
afac6be123
builder: updates to session after vendor
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: d4729749023fde0c57cded0c8159dc85cd7ee448
Component: engine
2017-09-22 09:51:52 -07:00
Daniel Nephin
441f6cef6d
Set APIVersion on the client, even when Ping fails
...
Refactor to support testing
Also add tests
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e828efa4ab
Component: cli
2017-09-22 10:08:19 -04:00
Marc Bihlmaier
120931ebc2
small reference change
...
Signed-off-by: Marc Bihlmaier <marc.bihlmaier@reddoxx.com >
Upstream-commit: 9490189cba
Component: cli
2017-09-22 10:49:30 +02:00
Sebastiaan van Stijn
6771dc87e0
Merge pull request #34878 from chchliang/imagebranch
...
Add testcases with ` Image` , covering all methods.
Upstream-commit: ba317637de9b9918cdc2139466dd51c6200bd158
Component: engine
2017-09-22 10:08:54 +02:00
Tonis Tiigi
2d68241660
vendor: update buildkit
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: ed6fd3d95bde4651ffb66d37cd1e5e76ee3c1f7b
Component: engine
2017-09-21 22:17:43 -07:00
Yuanhong Peng
d1d8439f3f
Fixes #29654 : take reference to RWLayer while committing/exporting
...
Take an extra reference to rwlayer while the container is being
committed or exported to avoid the removal of that layer.
Also add some checks before commit/export.
Signed-off-by: Yuanhong Peng <pengyuanhong@huawei.com >
Upstream-commit: 8c32659979150630a2c4eae4e7da944806c46297
Component: engine
2017-09-22 09:47:42 +08:00
Lei Jitang
efc44f60de
Fallback to use naive diff driver if enable CONFIG_OVERLAY_FS_REDIRECT_DIR
...
When use overlay2 as the graphdriver and the kernel enable
`CONFIG_OVERLAY_FS_REDIRECT_DIR=y`, rename a dir in lower layer
will has a xattr to redirct its dir to source dir. This make the
image layer unportable. This patch fallback to use naive diff driver
when kernel enable CONFIG_OVERLAY_FS_REDIRECT_DIR
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 49c3a7c4bac2877265ef8c4eaf210159560f08b4
Component: engine
2017-09-22 09:40:18 +08:00
Stephen J Day
6700f361c5
pkg/package: remove promise package
...
The promise package represents a simple enough concurrency pattern that
replicating it in place is sufficient. To end the propagation of this
package, it has been removed and the uses have been inlined.
While this code could likely be refactored to be simpler without the
package, the changes have been minimized to reduce the possibility of
defects. Someone else may want to do further refactoring to remove
closures and reduce the number of goroutines in use.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 0cd4ab3f9a3f242468484fc62b46e632fdba5e13
Component: engine
2017-09-21 17:56:45 -07:00
Yong Tang
3a50fe644a
Merge pull request #34861 from tklauser/fix-cstring-leaks
...
Fix CString memory leaks
Upstream-commit: 777d4a1bf45c85db6931205d4adbe38a17c583d7
Component: engine
2017-09-21 09:14:07 -07:00
Yong Tang
e22297f2e2
Merge pull request #34907 from chris-crone/set-test-ostype
...
Set integration test OSType with environment variable
Upstream-commit: 409d4711812c5c23815a783524e543ec653a234b
Component: engine
2017-09-21 04:13:17 -07:00
Yong Tang
9f6a445ef2
Merge pull request #34910 from chris-crone/plugin-list-not-implemented
...
Handle plugin list not implemented
Upstream-commit: 7d8deaa0db40b8b88d8e5039d23d4fcdb627fc00
Component: engine
2017-09-21 04:12:35 -07:00
chchliang
aebe8e8ce7
add Images testcase
...
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn >
Upstream-commit: 832f39c2ed53fc4a91265798198273044448bc7f
Component: engine
2017-09-21 17:54:29 +08:00