toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,731 Commits 3 Branches 295 Tags
07f1e1bf7bfb2f72f2aeb4d435238ca3c75bb1bf
Commit Graph
14731 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sven Dowideit 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
Sven Dowideit 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
Sven Dowideit 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
Sven Dowideit 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
Brian Goff 2e0ec2c817 Allow setting ulimits for containers 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 3f39050637d454e9ee8075153a917c8bfccb5bae
Component: engine
 2015-02-25 19:37:43 -05:00
Jessie Frazelle 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
Michael Crosby 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
Michael Crosby 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
AnandkumarPatel 0e9344f3dc Remove comment and b.UtilizeCache check. 
Signed-off-by: AnandkumarPatel <anandkumarpatel@gmail.com>
Upstream-commit: 1a5ea50aa81112c745030b3cf421a9baebcdb9f5
Component: engine
 2015-02-25 14:04:35 -08:00
Michael Crosby 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
Rik Nijessen 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
AnandkumarPatel a09a95ebf4 Add cacheBusted flag which gets set on the first cache miss 
Refactor of probeCache function

Signed-off-by: AnandkumarPatel <anandkumarpatel@gmail.com>
Upstream-commit: 2420c1f03bba2c90d2406e486974cdc0c8af0cea
Component: engine
 2015-02-25 10:27:32 -08:00
Jessie Frazelle 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
Alexander Morozov 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
John Howard (VM) d7d038bd8a api\server: Factored out UnixHttp on Windows, supported on Linux only. 
Signed-off-by: John Howard <John.Howard@microsoft.com>
Upstream-commit: 69246e15276d7010c00269be140b9fb1a5c11ae5
Component: engine
 2015-02-25 09:24:34 -08:00
Rik Nijessen 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
Phil Estes 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
Ahmet Alp Balkan 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
Ahmet Alp Balkan 8c8a1fb3a0 integ-cli: skip tests launching registry-v2 
Some pull/push tests are launching `registry-v2`
binary which is compiled and installed if the tests
are running in-container through `make test-integration-cli`.

However, registry is not supported to run on non-linux
platforms and we can't really spin up any registry-v2
containers in the remote DOCKER_TEST_HOST at this point.

Just skipping those with the new TestRequirement called
`RegistryHosting`.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: e2aa8f0cd984fbb31231240052e5505e1b1e3d2f
Component: engine
 2015-02-24 23:19:59 -08:00
Ahmet Alp Balkan 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
Ahmet Alp Balkan 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
Ahmet Alp Balkan 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
AnandkumarPatel 2528f2e0d3 Set UtilizeCache to false on cache miss 
Signed-off-by: Anandkumar Patel <anandkumarpatel@gmail.com>

Signed-off-by: AnandkumarPatel <anandkumarpatel@gmail.com>
Upstream-commit: 1e746a8a2b2f8a88903feca430f254605dcc6cc8
Component: engine
 2015-02-24 18:29:26 -08:00
Jessica Frazelle 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
Alexander Morozov 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
Ahmet Alp Balkan 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
Jessie Frazelle 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
Jessie Frazelle 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
Ahmet Alp Balkan 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
Ahmet Alp Balkan 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
Jessie Frazelle 6fdd96a789 Merge pull request #10989 from ahmetalpbalkan/win-cli/TestCliProxyProxyTCPSock-skip 
integ-cli: skip TestCliProxyProxyTCPSock on remote daemon
Upstream-commit: 11717741fd31cf9e27a07138dfb998f7aed9da4f
Component: engine
 2015-02-24 15:47:46 -08:00
Michael Crosby ab99465eeb Add ContainerCreateResponse type 
This type is produced on the server side and is a type safe struct that
can be encoded to json.  It is consumed via the client.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: f57c26553b91e16fa3ee6a815943eaf8f29af82b
Component: engine
 2015-02-24 15:27:49 -08:00
Michael Crosby d775414696 Merge pull request #10837 from ahmetalpbalkan/win-cli/readContainerFile-with-exec 
integration-cli: readContainerFileWithExec for links tests
Upstream-commit: 435d654b093e8662ab8c9f82fe4321dcad81c289
Component: engine
 2015-02-24 15:24:48 -08:00
Tibor Vass de2c651b17 Merge pull request #9123 from rhatdan/commit-change 
Patch to commit-change patch to add docker import support
Upstream-commit: e7dc7a63423911430512bb5ecf693d58de459b40
Component: engine
 2015-02-24 17:09:10 -05:00
Michael Crosby c1ee38da67 Merge pull request #10935 from coolljt0725/fix_commit 
Fix docker commit make a paused container to unpaused
Upstream-commit: bd95269fb917850fcfe8951135a61eb7398bcc71
Component: engine
 2015-02-24 13:28:32 -08:00
Michael Crosby ab9941d980 Merge pull request #10957 from tianon/cleanup-autogen 
Cleanup "autogen/" if we have successful build
Upstream-commit: a7cacbeb1d1b85e9c12874de8dc7493b73bcc624
Component: engine
 2015-02-24 13:25:46 -08:00
Michael Crosby 7a7f9dbbc1 Merge pull request #10980 from miminar/fix-volumes-from 
Fixed bad handling of "container not found" error
Upstream-commit: 478a9462e8776f60c8445972bcb3e506c6e7d413
Component: engine
 2015-02-24 13:23:34 -08:00
Michael Crosby 901bce48ed Merge pull request #10985 from jfrazelle/add-tools-doc 
add tools doc
Upstream-commit: 7d62ebf278cefb23ed181f74f264763995029e77
Component: engine
 2015-02-24 13:13:45 -08:00
Michael Crosby 3e98bd7359 Merge pull request #10984 from thaJeztah/do-re-mi 
Order maintainers alphabetically
Upstream-commit: aa2b3c668b03aea11b31753672a4d72fb1222d99
Component: engine
 2015-02-24 13:13:08 -08:00
Jessie Frazelle 7af3890cce Merge pull request #10988 from ahmetalpbalkan/TestBuildAddBadLinks-leftover-rm 
Remove leftover debugging artifact in test
Upstream-commit: 3b484c95542f3018fb24b7a0d26a0fe0c4da063c
Component: engine
 2015-02-24 12:47:55 -08:00
Ahmet Alp Balkan 31a690e69b integ-cli: skip TestCliProxyProxyTCPSock on remote daemon 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 6a9edfdc3b8ef4ed6febe8cee13dfd6786541b3b
Component: engine
 2015-02-24 12:04:33 -08:00
Ahmet Alp Balkan d5ee9d6913 Remove leftover debugging artifact in test 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: e9e993922d3173a292d4caaf35cb913ddc494f0c
Component: engine
 2015-02-24 11:44:14 -08:00
Jessica Frazelle a9eaa4b1bb add tools doc 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Upstream-commit: e63a693c6d4ae76cded0029bb7f60216c4b11da6
Component: engine
 2015-02-24 11:05:05 -08:00
Michael Crosby aab969a855 Move stats api types into api/types package 
Move the stats structs from the api/stats package into a new package
api/types that will contain all the api structs for docker's api request
and responses.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7fed7d7eb4d7766d9342821f2667d160c5f958eb
Component: engine
 2015-02-24 10:47:47 -08:00
Michael Crosby 59d825b194 Merge pull request #10982 from msabramo/CONTRIBUTING_tweaks 
CONTRIBUTING.md: punctuation fixes
Upstream-commit: d0bc3537d7cc7f152842c7d21c9eae85e0a95a4c
Component: engine
 2015-02-24 10:02:58 -08:00
Dan Walsh a3a5e74642 I am only seeing the values I set 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 4a9fa9650b154e70d55f750c3674c2d6dd390bef
Component: engine
 2015-02-24 13:01:36 -05:00
Dan Walsh 4e766f5eaa pass --change changes to the import job 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 17abfc3ddc79592753289a8556a343e276fb15b5
Component: engine
 2015-02-24 13:01:36 -05:00
Dan Walsh 2bc83bf87b add docs for commit --change 
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 5767548fa79342cee94dbb66b9c41671d4a1879f
Component: engine
 2015-02-24 13:01:36 -05:00
Michael Crosby 3aa5f48b11 Return error on invalid --change command 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Docker-DCO-1.1-Signed-off-by: Michael Crosby <crosbymichael@gmail.com> (github: rhatdan)
Upstream-commit: 3210d13fc8fb93263a7a5eadef0a0f133087a889
Component: engine
 2015-02-24 13:01:35 -05:00
Daniel, Dao Quang Minh d6b333a1a3 instantiate the builder job in commit integration tests 
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: rhatdan)
Upstream-commit: 6d4cd446fe1df4074f44267c4c5b0134bcedc65c
Component: engine
 2015-02-24 13:01:35 -05:00