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
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
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
Component: cli
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
Andrew Hsu
5338e5013a
Merge component 'packaging' from git@github.com:docker/docker-ce-packaging master
2017-09-19 11:14:46 -07:00
Andrew Hsu
46ea757ea5
Merge component 'engine' from git@github.com:moby/moby master
2017-09-19 11:14:35 -07:00
Yong Tang
95004c9da9
Merge pull request #31993 from dccurtis/issue-31816
...
Fixing ‘docker cp’ to allow new target file name in a host symlinked directory
Upstream-commit: 149f3aceb277ecccd33ee815e9c54d6aec782ab5
Component: engine
2017-09-19 10:54:53 -07:00
Akihiro Suda
d382cdf023
Merge pull request #33492 from simonferquel/typed-builder-commands-squashed
...
[Builder] Introduce a typed command system and 2 phase parse/dispatch build
Upstream-commit: 22e15721b1f33f32f07615e034cf3a7b4c865aa3
Component: engine
2017-09-20 02:52:23 +09:00
Brian Goff
6a9321461a
Merge pull request #34684 from cpuguy83/fix_selinux_with_mount_api
...
Set selinux label on local volumes from mounts API
Upstream-commit: 3ddced570dbd7c07291df15bf0b5ac02b04453ca
Component: engine
2017-09-19 13:43:40 -04:00
Andrew Hsu
a5ceeb03a8
Merge component 'cli' from git@github.com:docker/cli master
2017-09-19 10:12:43 -07:00
John Howard
ddb0ee3757
Revendor Microsoft/opengcs @ v0.3.4
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2798576b37aa99643a06366f00072b6026c0b77e
Component: engine
2017-09-19 09:56:23 -07:00
Brian Goff
cb0c1a12c4
Decouple plugin manager from libcontainerd package
...
libcontainerd has a bunch of platform dependent code and huge interfaces
that are a pain implement.
To make the plugin manager a bit easier to work with, extract the plugin
executor into an interface and move the containerd implementation to a
separate package.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: c85e8622a4813d7b72d74517faa03ab5de4c4550
Component: engine
2017-09-19 12:17:55 -04:00
Yong Tang
84b2d8c7a7
Merge pull request #34732 from vizv/fix-relabel-config-files
...
daemon: relabel config files.
Upstream-commit: 1bb55e6495cea72d6bca17d90ab25573766d07b3
Component: engine
2017-09-19 08:46:54 -07:00
Sebastiaan van Stijn
1411476434
Merge pull request #542 from vdemeester/tidying-loader-test-a-bit
...
Tidying up compose/loader test a bit
Upstream-commit: 9e162fb011
Component: cli
2017-09-19 17:44:08 +02:00
Sebastiaan van Stijn
00de807109
Merge pull request #541 from thaJeztah/fix-service-create-markdown
...
Fix service_create markdown
Upstream-commit: 68935944b3
Component: cli
2017-09-19 17:17:45 +02:00
Vincent Demeester
13c06c5996
Tidying up compose/loader test a bit
...
- Use `require` instead of `assert` when the assumption is "breaking" for the code
following. For example when asserting an error is not nil and then doing
`err.Error` on it ; if `err` is nil, the test will panic instead of fail.
- Use `assert.Len` when possible. The error message is better.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: f34655ecf8
Component: cli
2017-09-19 16:48:52 +02:00
Brian Goff
f7daf26c0f
Set selinux label on local volumes from mounts API
...
When using a volume via the `Binds` API, a shared selinux label is
automatically set.
The `Mounts` API is not setting this, which makes volumes specified via
the mounts API useless when selinux is enabled.
This fix adopts the same selinux label for volumes on the mounts API as on
binds.
Note in the case of both the `Binds` API and the `Mounts` API, the
selinux label is only applied when the volume driver is the `local`
driver.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5bbf5cc671ec8007bf8e0416799fff01d6a79b7e
Component: engine
2017-09-19 10:46:38 -04:00
Sebastiaan van Stijn
8828a6255a
Merge pull request #537 from vdemeester/add-jenkins-status-to-readme
...
Add jenkins build status to readme
Upstream-commit: b3aa1195d4
Component: cli
2017-09-19 16:33:33 +02:00
Sebastiaan van Stijn
6daf6c2b58
Fix service_create markdown
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 01ef9acd31
Component: cli
2017-09-19 16:29:52 +02:00
Yong Tang
da00b40eb4
Merge pull request #34721 from kinvolk/iaguis/add-missing-ecryptfs-string
...
Add missing eCryptfs translation to FsNames
Upstream-commit: 3fa72d38ec61377b506d31711f5cf1b855219926
Component: engine
2017-09-19 05:45:24 -07:00
Sebastiaan van Stijn
07893693ca
Merge pull request #34891 from Microsoft/jjh/fixcomment
...
LCOW: Fix comment in graphdriver code
Upstream-commit: 13e8a7a0067ce5d8d458b3a5985691bed0b0f30e
Component: engine
2017-09-19 14:43:35 +02:00
Antonio Murdaca
889843574b
volume: evaluate symlinks before relabeling mount source
...
Simple reproducer:
```sh
$ mkdir /var/foo
$ touch /var/foo/test
$ ln -s /var/foo /var/bar
$ docker run -ti -v /var/bar:/var/bar:Z fedora sh
sh-4.3# ls -lZ /var/bar/
ls: cannot open directory '/var/bar/': Permission denied
```
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: e0b22c0b9e013527ef121250b51ae780d2d2912d
Component: engine
2017-09-19 10:54:03 +02:00
Vincent Demeester
822098983e
Merge pull request #34520 from fnoeding/fixed-raw-splunk-logger
...
Fixed `raw` mode splunk logger
Upstream-commit: 5c57ca17d50c392b7ad627fc1215d7a7e91e0c41
Component: engine
2017-09-19 10:53:01 +02:00
Vincent Demeester
1cc4bb63c2
Merge pull request #34856 from dnephin/cleanup-version-tests
...
Replace old version tests
Upstream-commit: 7cd7cf9167fd4bc57889dfe01447f4bb0d52acc2
Component: engine
2017-09-19 10:34:50 +02:00
Yong Tang
1cc36398f9
Merge pull request #34495 from ripcurld0/registry_mirror_json
...
Exit if service config is loaded unsuccessfully on startup
Upstream-commit: b075cd2d78c1bafcded7d12ddb2e7c215e2e5117
Component: engine
2017-09-18 21:59:14 -07:00
Yong Tang
a17ffddbf6
Merge pull request #34550 from kolyshkin/libeudev
...
Update Dockerfiles to use Debian Stretch
Upstream-commit: cfdac1245a8d97ef21fb739ef3e631bdb852bbc7
Component: engine
2017-09-18 21:03:31 -07:00
John Howard
f8cc2fb021
LCOW: Fix comment in graphdriver code
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: f9fc269c204b96b34a479f3e55e41886ed2626b0
Component: engine
2017-09-18 19:52:55 -07:00
Shukui Yang
b07dcb72fb
Close pipe if mountFrom failed.
...
Signed-off-by: Shukui Yang <yangshukui@huawei.com >
Upstream-commit: 9f38923901352459bb621d0b3587a6517e67eeb3
Component: engine
2017-09-19 01:25:39 +00:00
Victor Vieux
7ac80a2691
Merge pull request #34674 from pradipd/windows_routingmesh
...
Enabling ILB/ELB on windows using per-node, per-network LB endpoint.
Upstream-commit: a2ee40b98c281139c75b38e0e11aa35726021169
Component: engine
2017-09-18 15:56:17 -07:00