p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,419 Commits 2 Branches 295 Tags
272eeccbe208fc72ac9f30cce4e47a041844a481
Commit Graph

13419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessie Frazelle
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
Doug Davis
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
Jessie Frazelle
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
Sven Dowideit
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
Sven Dowideit
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
Liu Hua
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
Tibor Vass
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
Sven Dowideit
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
James Turnbull
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
Sven Dowideit
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
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
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
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
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
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
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
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
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
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
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
Daniel, Dao Quang Minh
22d99ec297 support changes in commit job 
In addition to config env, `commit` now will also accepts a `changes` env which
is a string contains new-line separated Dockerfile instructions.
`commit` will evaluate `changes` into `runconfig.Config` and merge it with
`config` env, and then finally commit a new image with the changed config

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: b30257ccf96f646c6b008312d39544d6700f5cb1
Component: engine
 2015-02-24 13:01:35 -05:00
Dan Walsh
aeec0467c9 build_config job: parse dockerfile ast into config 
Instead of building the actual image, `build_config` will serialize a subset of
dockerfile ast into *runconfig.Config

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: 7f091eca704970a5cb8a4fdab295dae543c47a89
Component: engine
 2015-02-24 13:01:35 -05:00
Daniel, Dao Quang Minh
280f363541 pass --change changes to the commit job 
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: f8e77dfb3de50b3c4f0f8c852389a6ed5bcbcd6e
Component: engine
 2015-02-24 13:01:35 -05:00