d96e36cbbf
Revendor hcsshim
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-05-31 14:42:01 -07:00
0b5e84cc8d
Merge pull request #23046 from mountkin/fix-23045
...
fix flaky test TestImportFileWithMessage
2016-05-31 09:39:38 -07:00
d1e9e86122
Merge pull request #23108 from michael-holzheu/s390x-dockerfile-gcc-6.1
...
Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1)
2016-05-31 09:14:41 -07:00
b5490d4897
Dockerfile.s390x: Move to gcc 6.1 (go 1.6.1)
...
Pull request #22840 and commit 40b21745ccgolang/go#15814
* golang/go#15628
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-05-31 04:39:20 -04:00
ba372df79c
Merge pull request #23113 from AkihiroSuda/fixTIOCGWINSZ23112
...
Fix pkg/jsonmessage.TestProgress panic
2016-05-31 14:58:55 +08:00
a1f1e9c6d9
Merge pull request #23038 from AkihiroSuda/fixPkgDirectoryFilepathWalk
...
Fix filepath.Walk misusage in pkg/directory
2016-05-30 22:18:56 -07:00
709478c8a3
Fix pkg/jsonmessage.TestProgress panic
...
Fix #23112
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-31 04:19:00 +00:00
ef42e2f214
Merge pull request #23106 from LINBIT/master
...
Add the DRBD Docker Volume Plugin to the documentation
2016-05-30 18:21:26 +02:00
ef238db508
Add the DRBD Docker Volume Plugin to the documentation
...
Signed-off-by: Roland Kammerer <roland.kammerer@linbit.com>
2016-05-30 17:46:53 +02:00
edcc9577bf
Merge pull request #22103 from coolljt0725/fix_22093
...
Fix docker create with duplicate volume failed to remove
2016-05-30 15:57:13 +02:00
f3a7abee81
Merge pull request #22384 from yongtang/22358-log-tag-prefix
...
Remove `docker/` prefix from log messages tag.
2016-05-30 14:48:31 +02:00
34e0a01de2
Merge pull request #23091 from allencloud/print-network-name-when-rm
...
print network name when rm successfully
2016-05-30 13:33:29 +02:00
cd53ec5244
Fix filepath.Walk misusage in pkg/directory
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-30 07:40:46 +00:00
d305b0385c
Merge pull request #23092 from albers/completion-dockerd
...
bash completion for dockerd
2016-05-29 18:23:33 +02:00
27ebd79222
print network name when rm successfully
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-29 23:42:45 +08:00
5f1c5b28a7
bash completion for dockerd
...
Signed-off-by: Harald Albers <github@albersweb.de>
2016-05-29 07:09:05 -07:00
6184518fe3
Merge pull request #23081 from ibuildthecloud/not-insane
...
Change insane to infallible
2016-05-29 11:21:51 +02:00
c050102536
Merge pull request #23019 from vdemeester/more-daemon-horn-moving
...
Moving some more methods away from daemon.go
2016-05-28 22:07:31 -07:00
cc5024225a
Change insane to infallible
...
Signed-off-by: Darren Shepherd <darren@rancher.com>
2016-05-28 09:49:34 -07:00
02caa73df4
Merge pull request #21895 from hypriot/add-raspbian-jessie-deb
...
Build deb package for all Raspberry Pi's / raspbian-jessie
2016-05-28 12:48:36 +02:00
da39e9a4f9
Merge pull request #23054 from mountkin/test-comments
...
make the error message in TestRunSeccompDefaultProfile more precise
2016-05-28 10:11:04 +02:00
e0ee0ac789
Merge pull request #23074 from jstarks/fix_windows_graph_name
...
Windows: fix Windows graph driver name
2016-05-27 22:23:51 -04:00
9369457603
Merge pull request #23041 from AkihiroSuda/fixPkgDiscoveryKvTestTooShortSleep
...
Fix too short time.Sleep() in pkg/discovery/kv/kv_test.go
2016-05-27 21:11:33 -04:00
f80bfdf85c
make the error message in TestRunSeccompDefaultProfile more precise
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-05-28 09:06:25 +08:00
8a26b1dd61
Merge pull request #23073 from justincormack/splitseccomptest
...
Split the Seccomp tests into two
2016-05-27 17:27:08 -07:00
58b4164feb
Merge pull request #23061 from thaJeztah/remove-GO15VENDOREXPERIMENT
...
Remove GO15VENDOREXPERIMENT
2016-05-27 16:54:19 -07:00
f182748b9b
Windows: fix Windows graph driver name
...
Reverting "Windows filter storage driver" to "windowsfilter".
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-05-27 16:24:02 -07:00
d94daf624a
Merge pull request #23057 from clnperez/seccomp-bump
...
Bump the seccomp versions to pull in fixes and new commits
2016-05-27 16:02:00 -07:00
cfca3255a8
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>
2016-05-27 15:38:29 -07:00
b1f8b45b8f
Merge pull request #23067 from shishir-a412ed/fix_commit_issue
...
Fixes Issue # 22992: docker commit failing
2016-05-27 15:06:29 -07:00
4441a6c4c6
Merge pull request #22716 from jmzwcn/issue22466-patches
...
Embedded DNS problem after renaming container. Step2:change in docker…
2016-05-27 23:27:42 +02:00
4a031f1f80
Merge pull request #22621 from yongtang/05092016-remove-deprecated-command-line-short-variant-options
...
Un-deprecated command line short variant options of `-c`
2016-05-27 23:12:08 +02:00
fd7ec4b9e5
Merge pull request #22912 from duglin/FixImportTest
...
Fix docker import test
2016-05-27 14:03:44 -07:00
d59458c12d
Update golang 1.6.2
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-05-27 23:00:05 +02:00
46c61497a0
Build deb for raspbian-jessie
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-05-27 22:54:50 +02:00
ec3ccde18b
Merge pull request #22438 from yongtang/22420-inconsistent-tmpfs-behavior
...
Inconsistent --tmpfs behavior
2016-05-27 15:54:37 -04:00
068d466cc7
Merge pull request #23060 from friism/add-power-shell-example
...
Add power shell example
2016-05-27 21:21:32 +02:00
ab391c9ab5
Add powershell example and make linux build example consistent with other examples
...
Signed-off-by: Michael Friis <friism@gmail.com>
2016-05-27 11:49:09 -07:00
09d0720e2f
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>
2016-05-27 14:35:46 -04:00
01409bf069
Merge pull request #22376 from vdemeester/use-dockerd-in-integration-cli
...
Use dockerd instead of docker daemon in integration-cli
2016-05-27 10:09:43 -07:00
f1276cd3aa
Merge pull request #23039 from yongtang/05262016-docs-cluster-store-opts
...
Fix error in dockerd.md for incorrect cluster-store-opts example.
2016-05-27 18:55:48 +02:00
b4708e2754
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>
2016-05-27 18:15:01 +02:00
1d87f788b1
Merge pull request #23030 from Microsoft/jjh/xenonworkdir
...
Windows: Default isolation and workdir
2016-05-27 11:31:36 -04:00
6e721f6432
Merge pull request #23032 from tonistiigi/walk-err-fix
...
Fix directory walker error checking
2016-05-27 11:20:45 -04:00
9d6989bbb6
fix flaky test TestImportFileWithMessage
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2016-05-27 23:19:29 +08:00
d864a14620
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>
2016-05-27 11:12:47 -04:00
24d2ee8c48
Merge pull request #22984 from Microsoft/jjh/ttymessage
...
Better error on attach no tty
2016-05-27 16:57:36 +02:00
ab9204c826
Merge pull request #23049 from vdemeester/search-validate-before-call
...
Validate filter values before calling registry.
2016-05-27 10:21:40 -04:00
9b0d385975
Merge pull request #22840 from runcom/go1.6
...
Upgrade to golang 1.6.2
2016-05-27 06:54:57 -07:00
bfa0885c37
Moving some more methods away from daemon.go
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-27 11:32:26 +02:00
Darren Stahl
Alexander Morozov
Michael Holzheu
Lei Jitang
Akihiro Suda
Vincent Demeester
Roland Kammerer
Sebastiaan van Stijn
Antonio Murdaca
allencloud
Harald Albers
Darren Shepherd
Brian Goff
Shijiang Wei
Michael Crosby
John Starks
Justin Cormack
Arnaud Porterie
Stefan Scherer
Michael Friis
Shishir Mahajan
Sebastiaan van Stijn
Christy Perez