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
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
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
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
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
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
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
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
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
Sebastiaan van Stijn
793cd3af24
Merge pull request #30696 from yummypeng/lock-RWLayer-while-committing
...
Fixes #29654 : take reference to RWLayer while committing/exporting
Upstream-commit: a157dc53a850dff19ead074f24f9eff61b9d0622
Component: engine
2017-09-22 09:41:57 +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
Yong Tang
0dfdf37ab2
Merge pull request #34914 from euank/000003-percent
...
overlay2: fix faulty errcheck
Upstream-commit: 48cce229330561c104f777dac4f3f39ef2e2de6e
Component: engine
2017-09-20 19:52:10 -07:00
Euan Kemp
ccdce91e65
overlay2: fix faulty errcheck
...
The change in 7a7357dae1bcccb17e9b2d4c7c8f5c025fce56ca inadvertently
changed the `defer` error code into a no-op. This restores its behavior
prior to that code change, and also introduces a little more error
logging.
Signed-off-by: Euan Kemp <euan.kemp@coreos.com >
Upstream-commit: 639ab92f011245e17e9a293455a8dae1eb034022
Component: engine
2017-09-20 15:25:57 -07:00
Daniel Nephin
e55d5634bf
Add a new entrypoint for CI
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: dbf580be57a4bb854d7ce20d313e3a22ea337be5
Component: engine
2017-09-20 17:26:30 -04:00
Andrew Hsu
028b015443
Merge pull request #250 from seemethere/update_moby_components_hash
...
Hash needs to be updated for moby-components script
2017-09-20 13:40:13 -07:00
Eli Uriegas
1e4bfaa04a
Hash needs to be updated for moby-components script
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-09-20 13:25:51 -07:00
Yong Tang
5cb2c664ef
Merge pull request #34886 from cpuguy83/may_detach_mount
...
Automatically set `may_detach_mounts=1` on startup
Upstream-commit: 7d70d0fac339b2ed9715739748c89d0486456407
Component: engine
2017-09-20 11:31:45 -07:00
Christopher Crone
da0223d365
Set integration test OSType with environment variable
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: f0e5b3d7d89c0c87d001faa18bc60fd1b4531901
Component: engine
2017-09-20 19:50:17 +02:00
Christopher Crone
20c1a2b928
Handle plugin list not implemented
...
Signed-off-by: Christopher Crone <christopher.crone@docker.com >
Upstream-commit: e7e11bdd44878d28c642d72761aa41eb9ffce3d1
Component: engine
2017-09-20 19:48:33 +02:00
Tycho Andersen
9337e13113
prefer pass backend if it is available
...
Signed-off-by: Tycho Andersen <tycho@docker.com >
Upstream-commit: 713e87e780
2017-09-20 11:15:49 -06:00
Tycho Andersen
6280c12bb9
version bump for docker-credential-helpers
...
Signed-off-by: Tycho Andersen <tycho@docker.com >
Upstream-commit: 6bd5c63c78
2017-09-20 11:15:49 -06:00
Tycho Andersen
315e815656
defaultCredentialStore: make this a function
...
In the next patch, we'll use this to implement some logic about which
password backend to use.
Signed-off-by: Tycho Andersen <tycho@docker.com >
Upstream-commit: 4cf1849418
2017-09-20 11:14:27 -06:00
Yong Tang
7e0e805bca
Merge pull request #34863 from keloyang/close-pipe
...
Close pipe in overlay2 graphdriver
Upstream-commit: e40d5e665c6de904ea1e22bb3aa615638ec05e2a
Component: engine
2017-09-20 09:37:15 -07:00
Sebastiaan van Stijn
cdbfcd2c1d
Merge pull request #545 from thaJeztah/fix-nocopy-description
...
Fix nocopy description
Upstream-commit: 10e292dbab
2017-09-20 17:54:55 +02:00
Daniel Nephin
36e37bb56e
Merge pull request #544 from vdemeester/fix-build-loading
...
Fix loader error with different build syntax
Upstream-commit: 09c8f47af1
2017-09-20 11:03:54 -04:00
Sebastiaan van Stijn
62cdceef74
Fix nocopy description
...
nocopy does not apply to bind mounts, only volumes
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0e72a6ff81
2017-09-20 16:43:15 +02:00
Brian Goff
de0f898e39
Automatically set may_detach_mounts=1 on startup
...
This is kernel config available in RHEL7.4 based kernels that enables
mountpoint removal where the mountpoint exists in other namespaces.
In particular this is important for making this pattern work:
```
umount -l /some/path
rm -r /some/path
```
Where `/some/path` exists in another mount namespace.
Setting this value will prevent `device or resource busy` errors when
attempting to the removal of `/some/path` in the example.
This setting is the default, and non-configurable, on upstream kernels
since 3.15.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 83c2152de503012195bd26069fd8fbd2dea4b32f
Component: engine
2017-09-20 09:57:25 -04:00
Sebastiaan van Stijn
e2fa4c4d55
Bump API version to 1.33
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 15a59e763b6bdb44f28ffafb20e173606308ce2c
Component: engine
2017-09-20 15:19:16 +02:00
Sebastiaan van Stijn
7d19908a7b
Merge pull request #504 from albers/completion-search--format
...
Add bash completion for `search --format`
Upstream-commit: da82dcb1db
2017-09-20 14:41:28 +02:00
Vincent Demeester
95b34532ce
Fix loader error with different build syntax
...
`build: .` was not working anymore. Fixing this by adding a new
tranform function for BuildConfig.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0da9f14821
2017-09-20 14:02:33 +02:00
Vincent Demeester
c59fc2b89e
Merge pull request #352 from albers/fix-completion--credential-spec
...
Improve bash completion for `--credential-spec`
Upstream-commit: 16804b7313
2017-09-20 11:52:11 +02:00
Vincent Demeester
48266cefa7
Merge pull request #531 from seemethere/add_cross_targets
...
Add a way to just build windows and osx
Upstream-commit: bd31cb4bd5
2017-09-20 08:52:56 +02:00
Eli Uriegas
0ee27e86a8
Add a way to just build windows and osx
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 51080d6148
2017-09-19 16:48:31 -07:00
Sebastiaan van Stijn
bb1c0c5aa8
Merge pull request #34846 from Microsoft/jjh/debuggcs
...
LCOW: Add UVM debugability by grabbing logs before tear-down
Upstream-commit: 7cbbbb95097f065757d38bcccdb1bbef81d10ddb
Component: engine
2017-09-19 22:33:46 +02:00
Sebastiaan van Stijn
d9942eee10
Merge pull request #34117 from cpuguy83/decouple_plugin_manager_from_executor
...
Decouple plugin manager from libcontainerd package
Upstream-commit: b6b85da6576b3e923325897aab9b12d85c014e1b
Component: engine
2017-09-19 21:07:57 +02:00
Christopher Crone
Akihiro Suda
Vincent Demeester
Vincent Demeester
allencloud
Flavio Crisciani
Brian Goff
Allen Sun
Daniel Nephin
Yong Tang
Tonis Tiigi
Marc Bihlmaier
Sebastiaan van Stijn
Yuanhong Peng
Lei Jitang
Stephen J Day
chchliang
Euan Kemp
Andrew Hsu
Eli Uriegas
Tycho Andersen
Daniel Nephin
Sebastiaan van Stijn