59586d02b1
Move registry service options to the daemon configuration.
...
Allowing to set their values in the daemon configuration file.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-10 11:53:11 -05:00
5ded3a212b
Merge pull request #20852 from wenchma/net-alias
...
Add tests of unsupported network-scoped alias on default networks
2016-03-07 13:37:12 -05:00
dc82c2dda9
Merge pull request #20998 from Ralle/Ralle-fix-json
...
Update dockervolumes.md
2016-03-07 19:35:28 +01:00
086d06dce1
Update dockervolumes.md
...
Fix JSON highlighting
Signed-off-by: Rasmus Abrahamsen <spam@rasmusa.net>
2016-03-07 18:47:45 +01:00
bc730f3d99
Merge pull request #20982 from Microsoft/jstarks/fix_tp5_commit
...
Windows: Revendor github.com/Microsoft/hcsshim
2016-03-07 11:20:14 -05:00
64a4a7a191
Merge pull request #20994 from runcom/fix-debugf
...
api: server: server: remove redunant debugf
2016-03-07 13:32:10 +01:00
526ddd3512
api: server: server: remove redunant debugf
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-07 09:03:29 +01:00
86ba0e29f5
Merge pull request #20866 from suiyuan2009/20801-add-ubuntu-notice
...
add ubuntu arch note
2016-03-06 11:50:18 +01:00
11b9d7f1ad
Merge pull request #20967 from calavera/fix_stop_hanging_on_dead_process
...
Do not wait for container on stop if the process doesn't exist.
2016-03-06 11:37:59 +01:00
b2f1f7ee00
add ubuntu arch note
...
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
fix ubuntu installation guide url
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
fix ubuntu installation guide url
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
add ubuntu arch note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
add ubuntu installation note
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
fix ubuntu installation guide url
Signed-off-by: Ziming Dong <bnudzm@foxmail.com>
2016-03-06 14:19:58 +08:00
53b8b8f058
Windows: Revendor github.com/Microsoft/hcsshim
...
This fixes commit on Windows post-TP4 due to a small change
in behavior in the ExportLayer API.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-03-05 19:10:32 -08:00
91cafaadac
Merge pull request #20981 from justincormack/seccomp_ipc
...
Add ipc syscall to default seccomp profile
2016-03-05 15:29:19 -08:00
31410a6d79
Add ipc syscall to default seccomp profile
...
On 32 bit x86 this is a multiplexing syscall for the system V
ipc syscalls such as shmget, and so needs to be allowed for
shared memory access for 32 bit binaries.
Fixes #20733
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-03-05 22:12:23 +00:00
beb17c096d
Merge pull request #20978 from allencloud/fix-typo
...
fix typos
2016-03-05 12:41:37 -05:00
2736f77a94
fix typos
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-03-06 00:59:11 +08:00
160abfbeea
Merge pull request #20803 from WeiZhang555/empty-stats-no-stream
...
Bug fix: stats --no-stream always print zero values
2016-03-05 08:47:41 -05:00
ea86c30a4a
Bug fix: stats --no-stream always print zero values
...
`docker stats --no-stream` always print zero values.
```
$ docker stats --no-stream
CONTAINER CPU % MEM USAGE / LIMIT MEM %
NET I/O BLOCK I/O
7f4ef234ca8c 0.00% 0 B / 0 B 0.00%
0 B / 0 B 0 B / 0 B
f05bd18819aa 0.00% 0 B / 0 B 0.00%
0 B / 0 B 0 B / 0 B
```
This commit will let docker client wait until it gets correct stat
data before print it on screen.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-03-05 13:22:26 +08:00
44fb8fa588
Merge pull request #20946 from thaJeztah/update-registry-links
...
Update links to Docker Hub
2016-03-04 22:37:57 +01:00
45865bc4f5
Merge pull request #20963 from tophj-ibm/properly-close-test-file
...
Properly close and remove file in daemon test
2016-03-04 16:27:07 -05:00
1a729c3dd8
Do not wait for container on stop if the process doesn't exist.
...
This fixes an issue that caused the client to hang forever if the
process died before the code arrived to exit the `Kill` function.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-03-04 16:00:58 -05:00
e7cbae9fd6
Merge pull request #20959 from Microsoft/jjh/bumptimeout
...
Windows CI: Bump timeout for tests
2016-03-04 11:44:25 -08:00
66e558c16c
Properly close and remove file in daemon test
...
Fixes a bug where a file would be created and not deleted in
DockerSuite.TestDaemonDiscoveryBackendConfigReload
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-03-04 14:22:30 -05:00
2af84d8875
Merge pull request #20934 from icecrime/20543_debugging
...
Fix race condition on daemon shutdown (#20543 )
2016-03-04 11:08:50 -08:00
ea738c633f
Merge pull request #20903 from wenchma/TestDockerNetworkInternalMode
...
Enhancement of TestDockerNetworkInternalMode
2016-03-04 20:00:35 +01:00
6a1ae187d0
Windows CI: Bump timeout for tests
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-03-04 09:36:46 -08:00
c08b674d56
Merge pull request #20843 from calavera/plugin_any_transport
...
Call plugins with custom transports.
2016-03-04 11:59:32 -05:00
44b56341d9
Merge pull request #20943 from vdemeester/20942-fix-containerPsContext
...
Fix #20942 TestContainerPsContext unit test
2016-03-04 16:49:47 +01:00
69004ff67e
Update links to Docker Hub
...
Updates links to Docker Hub with their new
URLs to prevent redirects.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-03-04 15:48:52 +01:00
29bade2cd0
Merge pull request #20938 from runcom/split-daemon
...
integration-cli: move daemon stuff to its own file
2016-03-04 15:09:35 +01:00
2787072a65
Try to fix #20942 TestContainerPsContext unit test
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-03-04 14:20:41 +01:00
8142ebb0be
Merge pull request #20834 from rhatdan/relabelvolume
...
Do not relabel if user did not request it for non local volumes
2016-03-04 13:17:54 +01:00
5f7941e412
Merge pull request #20929 from yongtang/19425-DockerSuite.TestBuildDockerignoringWildDirs
...
Optimize slow bottleneck test of DockerSuite.TestBuildDockerignoringWildDirs.
2016-03-04 09:47:56 +01:00
9bc62e6031
Merge pull request #20872 from duglin/Issue20470
...
Optimize .dockerignore when there are exclusions
2016-03-04 09:45:19 +01:00
9a9e2bb61d
integration-cli: move daemon stuff to its own file
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-03-04 09:29:24 +01:00
ad2fa39459
Fix race in container creation
...
Only register a container once it's successfully started. This avoids a
race condition where the daemon is killed while in the process of
calling `libcontainer.Container.Start`, and ends up killing -1.
There is a time window where the container `initProcess` is not set, and
its PID unknown. This commit fixes the race Engine side.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2016-03-03 20:25:03 -08:00
ea5acb08fa
Merge pull request #20854 from inatatsu/reduce-parsing-mountinfo
...
Eliminate redundant parsing of mountinfo
2016-03-03 19:48:32 -08:00
312e20bf6c
Enhancement of TestDockerNetworkInternalMode
...
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2016-03-04 10:56:10 +08:00
e8513675a2
Aufs: reduce redundant parsing of mountinfo
...
Check whether or not the file system type of a mountpoint is aufs
by calling statfs() instead of parsing mountinfo. This assumes
that aufs graph driver does not allow aufs as a backing file
system.
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com>
2016-03-04 11:39:59 +09:00
cb6cdb416c
Merge pull request #20927 from Zoltu/patch-1
...
Adds clarification to behavior of missing directories.
2016-03-04 01:55:27 +01:00
889d06178a
Adds clarification to behavior of missing directories.
...
Closes #20920
Signed-off-by: Micah Zoltu <micah@zoltu.net>
2016-03-03 23:41:13 +00:00
c77bb28dfb
Optimize slow bottleneck test of DockerSuite.TestBuildDockerignoringWildDirs.
...
This PR fix the DockerSuite.TestBuildDockerignoringWildDirs test
in #19425 .
Instead of having multiple RUN instructions in Dockerfile for every
single directory tested, this PR tries to collapse multiple RUN
instructions into one RUN instruction in Dockerfile.
When a docker image is built, each RUN instruction in Dockerfile
will generate one layer in history. It takes considerable amount of
time to build many layers if there are many RUN instructions within
the Dockerfile. Collapsing into one RUN instruction not only speeds
up the execution significantly, it also conforms to the general
guideline of the Dockerfile reference.
Since the test (DockerSuite.TestBuildDockerignoringWildDirs) is
really about testing the docker build with ignoring wild
directories, the purpose of the test is not altered with this PR
fix.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-03-03 23:16:10 +00:00
17156ba98f
Merge pull request #20832 from aaronlehmann/login-endpoint-refactor
...
Update login to use token handling code from distribution
2016-03-03 19:04:42 +01:00
ec79629a47
Merge pull request #20914 from yongtang/19425-DockerHubPullSuite.TestPullNonExistingImage
...
Optimize slow bottleneck test of DockerHubPullSuite.TestPullNonExistingImage.
2016-03-03 09:51:58 -08:00
89d950303c
Merge pull request #20901 from HackToday/buildimage
...
Fix the driver name empty case
2016-03-03 18:44:33 +01:00
00f9c2ce59
Merge pull request #20870 from Microsoft/jjh/testupdaterestartpolicy
...
Windows CI: TestUpdateRestartPolicy flakiness
2016-03-03 09:09:56 -08:00
ed4a736acc
Merge pull request #20906 from runcom/fix-int-tests
...
integration-cli: fixups
2016-03-03 09:08:07 -08:00
c4be28d6a8
Merge pull request #20262 from cpuguy83/implemnt_mount_opts_for_local_driver
...
Support mount opts for `local` volume driver
2016-03-03 09:02:12 -08:00
0efa5e7366
Merge pull request #20913 from estesp/vendor-api-usernsmode
...
Update engine-api vendor for UsernsMode
2016-03-03 08:59:43 -08:00
b7bc1ce1a4
Merge pull request #20730 from clnperez/sysinfo-match-ip-case
...
Match case for IP variables in sysinfo pkg
2016-03-03 08:48:57 -08:00
52d4fff0d7
Merge pull request #20890 from riyazdf/notary-snapshot-remote
...
Rotate snapshot key to server when initializing new notary repos
2016-03-03 08:45:06 -08:00
David Calavera
Brian Goff
Sebastiaan van Stijn
Ralle
Vincent Demeester
Antonio Murdaca
Antonio Murdaca
Ziming Dong
John Starks
Jess Frazelle
Justin Cormack
Doug Davis
allencloud
Zhang Wei
Christopher Jones
John Howard
Sebastiaan van Stijn
Arnaud Porterie
Alexander Morozov
Wen Cheng Ma
Tatsushi Inagaki
Micah Zoltu
Yong Tang