19caa36bb6
Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1)
...
Pull request #22840 and commit 40b21745cc ("Upgrade to golang 1.6.2")
introduces gcc 6.1 for Dockerfile.gccgo and Dockerfile.ppc64le.
So do this also for s390x and use "s390x/gcc:6.1" as base image.
In addition to this use "GO15VENDOREXPERIMENT=0" for notary build
as a workaround for:
* golang/go#15814
* golang/go#15628
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com >
Upstream-commit: b5490d48979c3afa29d50dc8527aa6579cd1e634
Component: engine
2016-05-31 04:39:20 -04:00
b6a3d1bab8
Add the DRBD Docker Volume Plugin to the documentation
...
Signed-off-by: Roland Kammerer <roland.kammerer@linbit.com >
Upstream-commit: ef238db508f55f70b982a95bb37e79536fe75e4b
Component: engine
2016-05-30 17:46:53 +02:00
df33adb751
Merge pull request #22103 from coolljt0725/fix_22093
...
Fix docker create with duplicate volume failed to remove
Upstream-commit: edcc9577bf95c2eeaa15955e7b1c00a18cec7cb6
Component: engine
2016-05-30 15:57:13 +02:00
801ed1028f
Merge pull request #22384 from yongtang/22358-log-tag-prefix
...
Remove `docker/` prefix from log messages tag.
Upstream-commit: f3a7abee8107eb13e13dfff959998286b87a34ed
Component: engine
2016-05-30 14:48:31 +02:00
cdf6273e0c
Merge pull request #23091 from allencloud/print-network-name-when-rm
...
print network name when rm successfully
Upstream-commit: 34e0a01de2e5f070b4d9b7d83166c5cf8fe20300
Component: engine
2016-05-30 13:33:29 +02:00
bb11d0c2a4
print network name when rm successfully
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 27ebd79222759762bec8a582f143408c7a32a969
Component: engine
2016-05-29 23:42:45 +08:00
9ca60cdcf4
bash completion for dockerd
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 5f1c5b28a719d63005ce5e2190348bdfbce629c3
Component: engine
2016-05-29 07:09:05 -07:00
97b7f31e77
Merge pull request #23081 from ibuildthecloud/not-insane
...
Change insane to infallible
Upstream-commit: 6184518fe3c902b3a38758fed551501591229b05
Component: engine
2016-05-29 11:21:51 +02:00
cd8eab09a6
Merge pull request #23019 from vdemeester/more-daemon-horn-moving
...
Moving some more methods away from daemon.go
Upstream-commit: c0501025368544a64060da431a270d8f954b7e98
Component: engine
2016-05-28 22:07:31 -07:00
c93effc149
Change insane to infallible
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: cc5024225a37d8e804a9b797299f92084423091a
Component: engine
2016-05-28 09:49:34 -07:00
7fd135c93f
Merge pull request #21895 from hypriot/add-raspbian-jessie-deb
...
Build deb package for all Raspberry Pi's / raspbian-jessie
Upstream-commit: 02caa73df411debed164f520a6a1304778f8b88c
Component: engine
2016-05-28 12:48:36 +02:00
1652ca95c9
Merge pull request #23054 from mountkin/test-comments
...
make the error message in TestRunSeccompDefaultProfile more precise
Upstream-commit: da39e9a4f920a15683dd0f23923c302d4db6eed5
Component: engine
2016-05-28 10:11:04 +02:00
819594b370
Merge pull request #23074 from jstarks/fix_windows_graph_name
...
Windows: fix Windows graph driver name
Upstream-commit: e0ee0ac7892ee7921c30b22df7a6ff4ae6b9d28c
Component: engine
2016-05-27 22:23:51 -04:00
e813bd3871
Merge pull request #23041 from AkihiroSuda/fixPkgDiscoveryKvTestTooShortSleep
...
Fix too short time.Sleep() in pkg/discovery/kv/kv_test.go
Upstream-commit: 936945760314801b99b471227937fc5a302f72e7
Component: engine
2016-05-27 21:11:33 -04:00
6240c16449
make the error message in TestRunSeccompDefaultProfile more precise
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: f80bfdf85ca3463f59c93bf73c484f42c308fa8b
Component: engine
2016-05-28 09:06:25 +08:00
41b187c1d6
Merge pull request #23073 from justincormack/splitseccomptest
...
Split the Seccomp tests into two
Upstream-commit: 8a26b1dd61c232ed5d75e305dc9618c56350214c
Component: engine
2016-05-27 17:27:08 -07:00
cbb77a7aad
Merge pull request #23061 from thaJeztah/remove-GO15VENDOREXPERIMENT
...
Remove GO15VENDOREXPERIMENT
Upstream-commit: 58b4164feb2ad75e6454012690be0eea9343261e
Component: engine
2016-05-27 16:54:19 -07:00
98b281fb61
Windows: fix Windows graph driver name
...
Reverting "Windows filter storage driver" to "windowsfilter".
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: f182748b9b7d639c4db09f4f72411aba5f811f4e
Component: engine
2016-05-27 16:24:02 -07:00
61146ea2e8
Merge pull request #23057 from clnperez/seccomp-bump
...
Bump the seccomp versions to pull in fixes and new commits
Upstream-commit: d94daf624ad1749ce3b6943e617cc38e63b7560d
Component: engine
2016-05-27 16:02:00 -07:00
084d431873
Split the Seccomp tests into two
...
The Seccomp tests ran 11 tests in parallel and this appears to be
hitting some sort of bug on CI. Splitting into two tests means that
I can no longer repeoduce the failure on the slow laptop where I could
reproduce the failures before.
Obviously this does not fix the underlying issue, which I will
continue to investigate, but not having the tests failing a lot
before the freeze for 1.12 would be rather helpful.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: cfca3255a83c7cbaeaa623617bf71688723b21aa
Component: engine
2016-05-27 15:38:29 -07:00
2aa8db7718
Merge pull request #23067 from shishir-a412ed/fix_commit_issue
...
Fixes Issue # 22992: docker commit failing
Upstream-commit: b1f8b45b8ff7e7f3dda116fcde3067cc8fc0afb0
Component: engine
2016-05-27 15:06:29 -07:00
c18e25c7fa
Merge pull request #22716 from jmzwcn/issue22466-patches
...
Embedded DNS problem after renaming container. Step2:change in docker…
Upstream-commit: 4441a6c4c68f6ec7acb0e2d92d72274fbf403425
Component: engine
2016-05-27 23:27:42 +02:00
ea5d7217d0
Merge pull request #22621 from yongtang/05092016-remove-deprecated-command-line-short-variant-options
...
Un-deprecated command line short variant options of `-c`
Upstream-commit: 4a031f1f80440cc61b56e5b6e111e155e4da066d
Component: engine
2016-05-27 23:12:08 +02:00
b822217717
Merge pull request #22912 from duglin/FixImportTest
...
Fix docker import test
Upstream-commit: fd7ec4b9e58fe5ba4abab4f60b63552e11246f3c
Component: engine
2016-05-27 14:03:44 -07:00
1ca96c8cd2
Update golang 1.6.2
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: d59458c12d76d732e0ab564ea0e769323af6d3d6
Component: engine
2016-05-27 23:00:05 +02:00
0aa032d270
Build deb for raspbian-jessie
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com >
Upstream-commit: 46c61497a056042397fed7db65059feb68d28e16
Component: engine
2016-05-27 22:54:50 +02:00
561b16903d
Merge pull request #22438 from yongtang/22420-inconsistent-tmpfs-behavior
...
Inconsistent --tmpfs behavior
Upstream-commit: ec3ccde18bb2b46f9d2e74fad61e7286aa292123
Component: engine
2016-05-27 15:54:37 -04:00
aa60879053
Merge pull request #23060 from friism/add-power-shell-example
...
Add power shell example
Upstream-commit: 068d466cc7cd4ef3915b983b61e9cd029936ac90
Component: engine
2016-05-27 21:21:32 +02:00
57ccaf383c
Add powershell example and make linux build example consistent with other examples
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: ab391c9ab595f01e76b82edda0800e13655cc6f3
Component: engine
2016-05-27 11:49:09 -07:00
bd261166b3
Fixes Issue # 22992: docker commit failing.
...
1) docker create / run / start: this would create a snapshot device and mounts it onto the filesystem.
So the first time GET operation is called. it will create the rootfs directory and return the path to rootfs
2) Now when I do docker commit. It will call the GET operation second time. This time the refcount will check
that the count > 1 (count=2). so the rootfs already exists, it will just return the path to rootfs.
Earlier it was just returning the mp: /var/lib/docker/devicemapper/mnt/{ID} and hence the inconsistent paths error.
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 09d0720e2fb6e30ee018887399f353f93ac2d421
Component: engine
2016-05-27 14:35:46 -04:00
148efb277e
Merge pull request #22376 from vdemeester/use-dockerd-in-integration-cli
...
Use dockerd instead of docker daemon in integration-cli
Upstream-commit: 01409bf069a4fbf8ebcbd27e2333a9d61d462138
Component: engine
2016-05-27 10:09:43 -07:00
8f272a4606
Merge pull request #23039 from yongtang/05262016-docs-cluster-store-opts
...
Fix error in dockerd.md for incorrect cluster-store-opts example.
Upstream-commit: f1276cd3aa8d2bff6e3ab1ac3a175deeecac405e
Component: engine
2016-05-27 18:55:48 +02:00
def859f313
Remove GO15VENDOREXPERIMENT
...
This environment variable is no longer
needed in Go 1.6 (as it's not the default).
Removed this environment variable from
all Dockerfiles except the Dockerfile.s390x,
which is still using gcc 5.3 (Go 1.5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b4708e275446aa85b6b37924dc9d3318cf69efd4
Component: engine
2016-05-27 18:15:01 +02:00
0c9b356dc5
Merge pull request #23030 from Microsoft/jjh/xenonworkdir
...
Windows: Default isolation and workdir
Upstream-commit: 1d87f788b1d544d388d599316f9999867c4c3c80
Component: engine
2016-05-27 11:31:36 -04:00
24d0cb8d62
Merge pull request #23032 from tonistiigi/walk-err-fix
...
Fix directory walker error checking
Upstream-commit: 6e721f6432da2fb6976b9c1cee41e15797cf6906
Component: engine
2016-05-27 11:20:45 -04:00
c5c3e7945d
Bump the seccomp versions to pull in fixes and new commits
...
enabling s390 and ppc64le function
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
Upstream-commit: d864a1462037a2746b7633fb0212218d017a5532
Component: engine
2016-05-27 11:12:47 -04:00
d2f37ef500
Merge pull request #22984 from Microsoft/jjh/ttymessage
...
Better error on attach no tty
Upstream-commit: 24d2ee8c485dc2a580ee57e3afc076dda307e3c8
Component: engine
2016-05-27 16:57:36 +02:00
0921f9fd2c
Merge pull request #23049 from vdemeester/search-validate-before-call
...
Validate filter values before calling registry.
Upstream-commit: ab9204c8264019f23587291ba03fc5ac71d215b9
Component: engine
2016-05-27 10:21:40 -04:00
9b06540d32
Merge pull request #22840 from runcom/go1.6
...
Upgrade to golang 1.6.2
Upstream-commit: 9b0d385975c80359b4cab2c75e4834fe803e12d5
Component: engine
2016-05-27 06:54:57 -07:00
fe69a90880
Moving some more methods away from daemon.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: bfa0885c37efe5734d93f5bbb9e6477f66358e7c
Component: engine
2016-05-27 11:32:26 +02:00
d460ba90a2
Validate filter values before calling registry.
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: cd012efa2e46ec82b7a1f742bfc6858513c4ee37
Component: engine
2016-05-27 11:13:12 +02:00
dca7370dee
Merge pull request #23035 from SvenDowideit/fix-links
...
Fix up stale links
Upstream-commit: bd5c9f59ea9dde983bf40b36f16311e550a5c2e4
Component: engine
2016-05-27 08:41:11 +02:00
3b66dda032
Fix too short time.Sleep() in pkg/discovery/kv/kv_test.go
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 937851580c91a5129a0a2f236e315b8b090a91fd
Component: engine
2016-05-27 04:08:55 +00:00
815da186d3
Fix error in dockerd.md for incorrect cluster-store-opts example.
...
This fix fixes an error in documentation (dockerd.md). In the
example given by dockerd.md, the option `cluster-store-opts`
is assigned with an array but this option can only be assigned
as a map.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 32b234885e798650cdff70f0459175e79a294b4d
Component: engine
2016-05-26 20:04:48 -07:00
6d3d3f4514
Merge pull request #22993 from rhatdan/relabel
...
Multiple fixes for SELinux labels.
Upstream-commit: 3f6fa8af4522ba9b5ce2e4a52f959970ae4ccb8a
Component: engine
2016-05-26 22:51:17 -04:00
0e099055bb
Inconsistent --tmpfs behavior
...
This fix tries to address the issue raised in #22420 . When
`--tmpfs` is specified with `/tmp`, the default value is
`rw,nosuid,nodev,noexec,relatime,size=65536k`. When `--tmpfs`
is specified with `/tmp:rw`, then the value changed to
`rw,nosuid,nodev,noexec,relatime`.
The reason for such an inconsistency is because docker tries
to add `size=65536k` option only when user provides no option.
This fix tries to address this issue by always pre-progating
`size=65536k` along with `rw,nosuid,nodev,noexec,relatime`.
If user provides a different value (e.g., `size=8192k`), it
will override the `size=65536k` anyway since the combined
options will be parsed and merged to remove any duplicates.
Additional test cases have been added to cover the changes
in this fix.
This fix fixes #22420 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 397a6fefadf9ac91a5c9de2447f4dea607296470
Component: engine
2016-05-26 19:28:18 -07:00
8607e03463
Fix up stale links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ee7696312580f14ce7b8fe70e9e4cbdc9f83919f
Component: engine
2016-05-27 00:28:46 +00:00
e9a370108d
Fix directory walker error checking
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 81d24e754d48ac8e9f0e4fe02befbf628179da43
Component: engine
2016-05-26 14:59:38 -07:00
d77d575d98
Merge pull request #22888 from ibuildthecloud/host-compat
...
Remove DOCKER_HTTP_HOST_COMPAT env var
Upstream-commit: ef89891855e132d3d0e4c92fa041f590c8e8198c
Component: engine
2016-05-26 14:41:22 -07:00
386cba6ed8
Merge pull request #23009 from Microsoft/WindowsLeakedHandle
...
Fix a leaked process handle of the first container to start on Windows
Upstream-commit: 11ddfa4b2b0ad1b08eb602250210a6b9d200cc58
Component: engine
2016-05-26 14:39:57 -07:00
