15ea5ae8fb
fix racy events test
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 202709d178a24bcbfac223f0bcd9c4eda669e928
Component: engine
2015-02-27 14:48:39 -08:00
7595c1bf94
Merge pull request #10998 from jfrazelle/fix-filter-events-test-better
...
Fix events test so it doesnt need new daemon
Upstream-commit: 2768ce0e4e773d0a0331c6294f31fd9ff9450062
Component: engine
2015-02-27 12:05:48 -08:00
030e1d866f
Merge pull request #11037 from coolljt0725/add_parse_mac
...
Add validate the input mac address on docker run command
Upstream-commit: 314a678da7f948548a7f5aae886b3089ce4a7c9b
Component: engine
2015-02-27 12:03:25 -08:00
80fc2cf3da
Merge pull request #11011 from coolljt0725/fix_rmi_conflict
...
Fix docker remove an image show misleading conflicts
Upstream-commit: 13030add69ca84a853c036ac139f3325afc1b0e0
Component: engine
2015-02-27 12:00:12 -08:00
ec994adca7
Merge pull request #11002 from ahmetalpbalkan/win-cli/dockerfile-path-fix
...
Support windows style dockerfile paths for build cmd
Upstream-commit: 1061c56a5fc126a76344ea9dca9aa5f5e75eb902
Component: engine
2015-02-27 11:57:19 -08:00
b540023f69
Add validate the input mac address on docker run command
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2ba0fbb0ae1701b638a4bb956187dd878385dc80
Component: engine
2015-02-27 07:27:12 -08:00
2d06b1cf02
Merge pull request #11017 from brahmaroutu/random_10962
...
moving random.go from utils
Upstream-commit: f5850e8e30b9420d26bd12136d8bbb6669d1e2bb
Component: engine
2015-02-26 21:35:42 -05:00
91a8e60aaa
Merge pull request #11013 from delftswa2014/10965-timeout
...
Move TimeoutConn to seperate pkg dir.
Upstream-commit: fe554589c0456c32d370615796c4fde4ecc23080
Component: engine
2015-02-26 17:40:42 -08:00
b74aa8d071
Merge pull request #11029 from brahmaroutu/fixtest_10963
...
When --net=none enabled, the test uses local filesystem
Upstream-commit: bcbe70588d1ff3ff28d78d56e221ff1efb7bbc47
Component: engine
2015-02-26 17:30:02 -08:00
5bd9f0f7c0
Merge pull request #10902 from estesp/10855-fix-add-host-doc
...
Correct --add-host documentation regarding host IP address retrieval
Upstream-commit: 94553f1ba6bd9f26059fc909586fd95230676432
Component: engine
2015-02-26 17:25:01 -08:00
bf718cd3ba
Merge pull request #11044 from moxiegirl/fix-image-11043
...
Rep README Fixing broken logo image
Upstream-commit: ac2521b87cfb9670bd3bfbf1a1ef8d8075e63737
Component: engine
2015-02-26 13:03:14 -08:00
272eeccbe2
Merge pull request #11007 from ahmetalpbalkan/context-close-cleanup
...
integ-cli: Add a few missing context cleanups
Upstream-commit: 082b7726e22c4e7e161cb715158675ed24fc3e4c
Component: engine
2015-02-26 11:05:30 -08:00
e051d5c51d
moving random.go from utils
...
Closes #10962
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 53ece336dcab8e778fc37afc7a264f7d168110ff
Component: engine
2015-02-26 18:31:18 +00:00
f720e9d2f5
When --net=none enabled, the test uses local filesystem
...
Closes #10963
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 17b6583a5a352d5cf6d8ba20b018dc96f231f476
Component: engine
2015-02-26 18:24:34 +00:00
0edfd99487
Merge pull request #11036 from liusdu/fix-typo
...
fix a minor typo in daemon/exec.go
Upstream-commit: 1d6f469764671863004dd6f685d0dc72290ec04b
Component: engine
2015-02-26 10:02:46 -08:00
f6890f9c00
Smaller image
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com >
Upstream-commit: 02639c03b78e325f2e87e0fbcb4f1db4e04fe847
Component: engine
2015-02-26 08:48:58 -08:00
a56cc9bb41
Fixing broken logo image
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com >
Upstream-commit: 2e567d22da23773bbd7997cec138c0ea92b69cb3
Component: engine
2015-02-26 08:45:59 -08:00
38df4a721b
Merge pull request #10831 from MalteJ/ipv6-ndp-proxy
...
Adding IPv6 NDP Proxying documentation
Upstream-commit: 9324cdac07484373c752f3368c3cb30db070b839
Component: engine
2015-02-26 07:19:36 -08:00
a8ca53b636
Merge pull request #11039 from SvenDowideit/fix-missing-compose-docs
...
Missed to added doc files
Upstream-commit: 7a93d52ea44405cd8e6c2644a3f849c00b327cc6
Component: engine
2015-02-27 01:13:35 +10:00
7bf2abf2b6
Missed to added doc files
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 7646e3f9574aabe7ebbd6eb8dc2ef0f4fcc4e3a9
Component: engine
2015-02-27 01:10:50 +10:00
394722ec93
fix a minor typo in daemon/exec.go
...
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
Upstream-commit: 5b794c413a147dbc06f76caa6f2c32d1f4b1f2ce
Component: engine
2015-02-26 19:11:27 +08:00
8ee6a61615
Merge pull request #10869 from SvenDowideit/extract-docs-base
...
Extract docs base
Upstream-commit: 7e2328b76e041bb7a1acb3e20dbea0c379f7f024
Component: engine
2015-02-25 23:16:46 -05:00
4bec37b70e
Fix docker remover an image show misleading conflicts
...
due to its dependency is tagged to multiple repositories
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d9d9175507f3ac2d43fa27bc5f0710c79cd14cfc
Component: engine
2015-02-26 12:01:35 +08:00
d372e2ab22
update the mkdocs.yml to add new docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 6d4b0f53342f4b56ad0770bd0e1bce6fcd898a41
Component: engine
2015-02-26 12:11:29 +10:00
0c7bf5829a
Merge pull request #10940 from 1HLtd/master
...
docs/man/docker.1.md: spelling mistake fix
Upstream-commit: f8dbcdc5994a300308f4d259c62b58974a25e028
Component: engine
2015-02-25 20:45:46 -05:00
a1794f8b7d
set the document meta-data for the orchestration docs to turn off the docker-version documentation dropdown, asit doesn't apply
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 0365e8c20422f96d14c6448218b02e59734e59ea
Component: engine
2015-02-26 11:41:39 +10:00
119882d0e4
Manually place the orchestration docs into the menu
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ac47a877403a894ac02724aaa111870edc7c2f8b
Component: engine
2015-02-26 11:41:39 +10:00
17fe06fc30
Don't require Docker 1.5.0 for docker build -f docs/Dockerfile
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 8d4459fffb5c1885b65506093538e059f0b51d90
Component: engine
2015-02-26 11:41:39 +10:00
824b119187
Import docs from swarm, machine and compose repositories,
...
Also add the image spec from the code area to show we're building from the repo-root now
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 3e84b9e56abdff7230e84a1830085c79c73aa3b7
Component: engine
2015-02-26 11:41:39 +10:00
593a99f129
Simplify the existing docs building by extracting the main Dockerfile into a docs/base Hub image
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ab545aed4c90134b33c9aab600ab2d18b6eafd73
Component: engine
2015-02-26 11:41:39 +10:00
71c9fa9fcf
Merge pull request #11025 from crosbymichael/test-rm-dev
...
Reinit slice for each dir in search
Upstream-commit: 321f4f06837fb5b8c1e8beb472a41c4961ec6f3a
Component: engine
2015-02-25 16:18:05 -08:00
205614d416
Reinit slice for each dir in search
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 8be8e41429a3af59df35a6b0281eefd2bb34e1b5
Component: engine
2015-02-25 15:53:07 -08:00
56a989cee4
Merge pull request #10510 from ashahab-altiscale/9875-lxc-image-layer
...
Added /dev paths to layer comparison
Upstream-commit: 481e75203d8c5db264a795c35d422d081a2f03b0
Component: engine
2015-02-25 14:52:31 -08:00
47a091cc6c
Merge pull request #10498 from ashahab-altiscale/9875-lxc-stats
...
Implements stats for lxc driver
Upstream-commit: 9a2e58dd2940d11d3c8f22a0fabe54591a5e3619
Component: engine
2015-02-25 13:46:18 -08:00
967da32c28
Rename package timeout to timeoutconn.
...
Signed-off-by: Rik Nijessen <riknijessen@gmail.com >
Upstream-commit: 7e7646c28a599731e62afec4c0c4dc0942309b7f
Component: engine
2015-02-25 20:52:37 +01:00
3541951109
Merge pull request #11001 from ahmetalpbalkan/win-cli/TestRunNoDupVolumes-fix
...
integ-cli: pass unix paths to TestRunNoDupVolumes
Upstream-commit: 21811f07861007da1481c7a1ad100720e09ffa98
Component: engine
2015-02-25 09:47:30 -08:00
c2a3fa853f
Merge pull request #11004 from ahmetalpbalkan/win-cli/TestRunBindMounts-skip
...
integ-cli: skip TestRunBindMounts (same-host daemon requirement)
Upstream-commit: 711175d6664cabc09634d6ff49a87cf41f8822c5
Component: engine
2015-02-25 09:37:15 -08:00
88b1d37e3b
Move TimeoutConn to seperate pkg dir.
...
Fixes #10965
Signed-off-by: Rik Nijessen <riknijessen@gmail.com >
Upstream-commit: 690a85797e70c3816a1dec768bff0c454e1e23a9
Component: engine
2015-02-25 17:09:47 +01:00
9d92f5d059
Correct --add-host documentation regarding host IP address retrieval
...
Fixes: 10855
The example was actually incorrect for many situations, and also, now
that we have IPv6 we should not that the example is for IPv4 and note
how to find IPv6 addresses. Also, the device they want to connect to
could be the bridge, or main ethernet device, or some other device
name, so note that as well.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: f8a146311d1ea1645e25b38910b717335bb684c0
Component: engine
2015-02-25 09:56:58 -05:00
ba75e02a5f
integ-cli: a few context cleanups
...
These cleanup calls were forgotten, adding these to
reduce garbage on windows CI machines.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: f6e95ef3a4d379fa2d5bd42bd293d61768d8208b
Component: engine
2015-02-25 01:09:06 -08:00
8535caec3a
integ-cli: skip TestRunBindMounts (same-host daemon requirement)
...
`TestRunBindMounts` requires daemon to be on the same host.
Running this cli test on Linux is fair enough coverage for
this functionality and we can skip this for platforms where
daemon cannot run side-by-side with the cli for now.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 26444e5e9ad3bc2babd62b76a9a4b46d82414738
Component: engine
2015-02-24 21:04:47 -08:00
bdccc883c1
Support windows style dockerfile paths for build cmd
...
Currently TestBuildRenamedDockerfile fails since passing
custom dockerfile paths like:
docker build -f dir/file .
fails on windows because those are unix paths. Instead, on
windows accept windows style paths like:
docker build -f dir\file .
and convert them to unix style paths using the helper we
have in `pkg/archive` so that daemon can correctly locate
the path in the context.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 5ecab9e831c6d39e649430013087a3e2a85fb949
Component: engine
2015-02-24 20:23:53 -08:00
53cee48083
integ-cli: pass unix paths to TestRunNoDupVolumes
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: db1f8f7481a825a921295adea36d2e56ee8703ae
Component: engine
2015-02-24 18:50:55 -08:00
72ed1a787d
Fix events test so it doesnt need new daemon
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Upstream-commit: 9aff77156b74cc248542601e146d87011819c10c
Component: engine
2015-02-24 18:28:16 -08:00
8589971917
Merge pull request #10999 from ahmetalpbalkan/win-cli/SameHostDaemon-skips-3
...
integ-cli: Skip some exec tests requiring same-host daemon
Upstream-commit: 309eec23787d9e1e4de58b6475467a1af73c4c26
Component: engine
2015-02-24 17:17:23 -08:00
f8b58965ad
integ-cli: Skip some exec tests requiring same-host daemon
...
This skips tests:
- `TestRunExecDir`
- `TestRunMutableNetworkFiles`
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: e6f88f091d59a32f7a1cd9baa18b9d792548f36d
Component: engine
2015-02-24 16:39:42 -08:00
735ebac419
Merge pull request #10995 from ahmetalpbalkan/win-cli/SameHostDaemon-skips-2
...
integ-cli: Skip new tests requiring same-host daemon
Upstream-commit: 1060a5334efac1b478ed7b61fa0d4fb8dc184ff0
Component: engine
2015-02-24 16:36:11 -08:00
29441b8fac
Merge pull request #10997 from ahmetalpbalkan/win-cli/TestSaveDirectoryPermissions-fix
...
integ-cli: remove bash dependency from TestSaveDirectoryPermissions
Upstream-commit: 8974f61fa38354e8782dd08395fc7b097fbeec3c
Component: engine
2015-02-24 16:31:04 -08:00
2792d90e6f
integ-cli: Skip new tests requiring same-host daemon
...
This skips tests:
- `TestExecAfterContainerRestart`
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: cfc8372c0a610ab87fed92f6ba6dd4100fef26d8
Component: engine
2015-02-24 16:30:22 -08:00
b3b00f07f4
integ-cli: remove bash dependency from TestSaveDirectoryPermissions
...
Use the new `runCommandPipelineWithOutput` helper to
remove bash dependency required for piping in
`TestSaveDirectoryPermissions`.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: c3e28351a1547f4999aafb0780e4b1a5d84d78ac
Component: engine
2015-02-24 15:52:06 -08:00
