centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 22:38:54 +07:00
Code Issues Packages Projects Releases Wiki Activity
21,811 Commits 54 Branches 28 Tags
d800a4e1ba7d23864aa541c1919465bcf22dd1a9
Commit Graph

2721 Commits

Author SHA1 Message Date
Christopher Jones
d800a4e1ba Fix integration-cli suite setup requirements 
This PR moves the testRequires check from within setupRegistry
and setupNotary to when the Suite itself starts up.

This fixes a bug where testRequires() in setupRegistry() would
succeed and start registry, but testRequires() in setupNotary()
would fail. This immediately exits the goroutine with registry
still running.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
 2016-01-29 16:35:20 -05:00
David Calavera
35ef3efe9a Merge pull request #19805 from WeiZhang555/test-inspect 
Make test code consistent
 2016-01-29 12:43:58 -08:00
Zhang Wei
62a856e912 Assert error in body of function inspectField* 
1. Replace raw `docker inspect -f xxx` with `inspectField`, to make code
cleaner and more consistent
2. assert the error in function `inspectField*` so we don't need to
assert the return value of it every time, this will make inspect easier.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-01-29 23:39:07 +08:00
Vincent Demeester
5f63c54192 Merge pull request #19790 from Microsoft/CombineSetupWorkingDir 
Combine SetupWorkingDirectory for Linux and Windows
 2016-01-29 08:52:08 +01:00
Sebastiaan van Stijn
7d13f2fb7d Merge pull request #19563 from Microsoft/10662-TestBuildCI1 
First batch of Windows-Windows TestBuild CI enabling
 2016-01-28 17:13:45 -08:00
Darren Stahl
87839b345e Temporarily removing TestBuildHistory on Windows for perf reasons 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-01-28 13:42:02 -08:00
Darren Stahl
ec31741ca1 Combine SetupWorkingDirectory for Linux and Windows 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-01-27 16:17:35 -08:00
David Calavera
0f5aa19593 Merge pull request #19767 from icecrime/factorize_sleeping_container 
Factorize sleeping containers
 2016-01-27 13:42:56 -08:00
Jess Frazelle
c39c7e6edf Merge pull request #19760 from cyli/re-vendor-notary 
Re-vendor Notary and docker/go
 2016-01-27 09:36:26 -08:00
Arnaud Porterie
777ee34b07 Factorize sleeping containers 
Add `runSleepingContainer` and `runSleepingContainerInImage` helper
functions to factor out the way to run system-specific idle containers.

Define a sleeping container as command `top` in image `busybox` for
Unix and as command `sleep 60` in image `busybox` for Windows. Provide a
single point of code to update those.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2016-01-27 08:48:08 -08:00
Antonio Murdaca
c1b168664f Merge pull request #19764 from Microsoft/jjh/testinspectapi 
Windows CI: PortTestInspectApi*
 2016-01-27 14:08:28 +01:00
John Howard
3c61f00616 Windows CI: PortTestInspectApi* 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-26 20:23:40 -08:00
John Howard
916b9db71d Windows CI: Darn it, I broke due to multiple declarations 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-26 19:58:53 -08:00
Sebastiaan van Stijn
3cf4884787 Merge pull request #19612 from Microsoft/jjh/apicontainerstest 
Windows CI: Fixup docker_api_containers_test.go
 2016-01-26 19:14:43 -08:00
Arnaud Porterie
603c04a789 Merge pull request #19744 from Microsoft/jjh/testhistory 
Windows CI: Enable TestHistory* cli tests
 2016-01-26 19:08:33 -08:00
Arnaud Porterie
864cca2287 Merge pull request #19605 from Microsoft/jjh/docker_api_images_test 
Windows CI: Porting for docker_api_images_test.go
 2016-01-26 19:04:25 -08:00
Arnaud Porterie
70c5e96cb8 Merge pull request #19604 from Microsoft/jjh/testrename 
Windows CI: Fix TestRename*
 2016-01-26 19:03:31 -08:00
Arnaud Porterie
51d4d8eff2 Merge pull request #19603 from Microsoft/jjh/testps 
Windows CI: Address simple failures in TestPS*
 2016-01-26 19:01:17 -08:00
Doug Davis
9b82174f93 Merge pull request #19742 from Microsoft/jjh/testrmi 
Windows CI: Port TestRmi tests
 2016-01-26 21:46:35 -05:00
cyli
0617521ba2 Update integration tests with new error messages, and to use different repos per test. 
This way we won't encounter any problems with one test using cached data from a different
test.

Signed-off-by: cyli <cyli@twistedmatrix.com>
 2016-01-26 18:02:00 -08:00
Brian Goff
146e49b039 Merge pull request #19671 from calavera/volume-dangling 
Make volume dangling filter return only used volumes with `dangling=false`.
 2016-01-26 17:01:20 -05:00
Antonio Murdaca
0b248e88ff Merge pull request #19734 from Microsoft/jjh/testtag 
Windows CI: Port TestTag* cli tests
 2016-01-26 22:56:36 +01:00
Tibor Vass
4adb0fb310 Merge pull request #19723 from bboreham/not-preferred 
Stop referring to requested IP address as "preferred"
 2016-01-26 13:46:09 -08:00
John Howard
15c32f39a9 Windows CI: Enable TestHistory* cli tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-26 12:42:09 -08:00
John Howard
94e5fab5ed Windows CI: Port TestRmi tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-26 12:22:37 -08:00
Darren Stahl
563a4d1b9f First batch of Windows-Windows TestBuild CI enabling 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-01-26 12:15:13 -08:00
John Howard
1723c6477f Windows CI: Port TestTag* cli tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2016-01-26 10:41:31 -08:00
Jess Frazelle
c56e309d05 Merge pull request #19712 from runcom/test-requires-apparmor 
integration-cli: require Apparmor
 2016-01-26 09:18:29 -08:00
Arnaud Porterie
269a6d7d36 Merge pull request #19705 from mavenugo/18222 
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
 2016-01-26 09:16:57 -08:00
Arnaud Porterie
7a97e938e2 Merge pull request #19490 from cyphar/remove-dockerinit 
Remove dockerinit once and for all
 2016-01-26 08:27:35 -08:00
Bryan Boreham
7126ecd0ad Stop referring to requested IP address as "preferred", 
since it is an error if that address is unavailable.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
 2016-01-26 15:13:26 +00:00
Doug Davis
fc8e344297 Merge pull request #19715 from coolljt0725/fix_test_daemon 
Test utils: fix daemon start utils
 2016-01-26 10:08:50 -05:00
Doug Davis
e5b5c0ebe8 Merge pull request #19713 from WeiZhang555/opt-TestEventsContainerFailStartDie 
Optimize `TestEventsContainerFailStartDie`
 2016-01-26 09:32:52 -05:00
Lei Jitang
e88258ca2e Test utils: fix daemon start utils 
User call `Start` could with args, and the args could
contains `--storage-driver`, but in `Start`, it will add
`--storage-driver` even though user has specified `--storage-driver`
in args.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2016-01-26 08:31:50 -05:00
Aleksa Sarai
4357ed4a73 *: purge dockerinit from source code 
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
 2016-01-26 23:47:02 +11:00
Madhu Venugopal
e38463b277 Move port-mapping ownership closer to Sandbox (from Endpoint) 
https://github.com/docker/libnetwork/pull/810 provides the more complete
solution for moving the Port-mapping ownership away from endpoint and
into Sandbox. But, this PR makes the best use of existing libnetwork
design and get a step closer to the gaol.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2016-01-26 03:59:03 -08:00
Zhang Wei
4f7dda3fb2 Optimize TestEventsContainerFailStartDie 
Optimize performance of `TestEventsContainerFailStartDie`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-01-26 19:23:18 +08:00
Antonio Murdaca
7ac8c77877 integration-cli: require Apparmor 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-01-26 11:57:14 +01:00
Vincent Demeester
613e91f36f Merge pull request #19703 from mountkin/speedup-TestEventsAttach 
optimize DockerSuite.TestEventsAttach
 2016-01-26 11:41:31 +01:00
Shijiang Wei
77a0f77e7f optimize DockerSuite.TestEventsAttach 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2016-01-26 10:45:45 +08:00
Tibor Vass
58c2488d07 Merge pull request #19568 from cpuguy83/17907_fix_rmv 
On container rm, don't remove named mountpoints
 2016-01-25 18:13:57 -08:00
Tibor Vass
2cb8fdd327 Merge pull request #19673 from aboch/epcs 
Save endpoint config only if endpoint creation succeeds
 2016-01-25 16:50:47 -08:00
Tibor Vass
f7abff4f81 Merge pull request #19560 from aboch/mn 
Reject multiple networks on container creation request
 2016-01-25 14:57:51 -08:00
Antonio Murdaca
0f0c35960f Merge pull request #19674 from tonistiigi/19652-fix-create-error-message 
Fix error message in container creation
 2016-01-25 23:47:57 +01:00
David Calavera
cf44f17258 Merge pull request #19619 from WeiZhang555/test-bottleneck-oomtrue 
Optimize TestEventsOOMDisableTrue
 2016-01-25 14:24:46 -08:00
Sebastiaan van Stijn
156e2f0e5c Merge pull request #19555 from hypriot/update-registry-on-dockerfile-armhf 
Update registry version in Dockerfile.armhf
 2016-01-25 14:14:00 -08:00
Tibor Vass
268a20af95 Merge pull request #19528 from cpuguy83/19475_abck_compat_for_vol_drivers 
Add back compat for volume drivers `Get` and `Ls`
 2016-01-25 13:53:51 -08:00
Alessandro Boch
733245b2e7 Save endpoint config only if endpoint creation succeeds 
- Currently it is being save upfront...

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-01-25 13:43:32 -08:00
David Calavera
1431b623a4 Make volume dangling filter return only used volumes with dangling=false. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2016-01-25 16:26:51 -05:00
Brian Goff
dd7d1c8a02 On container rm, don't remove named mountpoints 
This makes it so when calling `docker run --rm`, or `docker rm -v`, only
volumes specified without a name, e.g. `docker run -v /foo` instead of
`docker run -v awesome:/foo` are removed.

Note that all volumes are named, some are named by the user, some get a
generated name. This is specifically about how the volume was specified
on `run`, assuming that if the user specified it with a name they expect
it to persist after the container is cleaned up.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2016-01-25 15:51:28 -05:00