Commit Graph

12397 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
afb7a8b8ef Restored removed docker init options
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: 3bd3f7854ad87420cc8779f8f44356775ae4f878
Component: engine
2015-02-24 16:59:04 +00:00
c52be4e77a Re-order maintainers
Because they should be ordered alphabetically.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 681182ea7a45b513430c84484d8aa2c0c42514e5
Component: engine
2015-02-24 17:49:03 +01:00
5e3eccc909 CONTRIBUTING.md: punctuation fixes
Signed-off-by: Marc Abramowitz <marc@marc-abramowitz.com>
Upstream-commit: 301b3ffbbb6660a16096e68a942e8d5b073893e3
Component: engine
2015-02-24 08:21:49 -08:00
bddb299991 Fixed bad handling of "container not found" error
Create container job could fail because a container specified with
`--volumes-from` does not exist. This error is not propagated to client
though. Instead it's recognized by higher levels as "image not found".
Client then tries to pull the image and launch the container again.

This patch changes the lower level error message so that it's not
recognized as "image not found" and thus it's propagated to client.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: d96e8853145ed6a03529e093c49b91f0053472a6
Component: engine
2015-02-24 15:52:47 +01:00
8e37315c55 Fix docker commit make a paused container to unpaused. Closes #10932
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7c7c7f84dcc985dfac5aac5004d39d15e35f7812
Component: engine
2015-02-24 03:28:40 -08:00
86eef40206 Merge pull request #10724 from SvenDowideit/takeover-10470
Update best practices for entrypoint.
Upstream-commit: 1d27930faaacf6ebe4553c7b23087e2164816470
Component: engine
2015-02-24 15:32:16 +10:00
351cb675a4 Merge pull request #10923 from bradleywright/patch-1
Fix erroneously wrapped URLs in links
Upstream-commit: ad2063ca8461a903fe993188b4dbaa5da804a72b
Component: engine
2015-02-24 15:31:40 +10:00
61ee3dd26f Merge pull request #10929 from thaJeztah/docs-optimize-images
docs: optimize and consolidate images, remove duplicates
Upstream-commit: e500c00d7cd855c02f390d1f9d55b668cc191854
Component: engine
2015-02-24 15:31:00 +10:00
a6d4aa225d Add Phil Estes as a core maintainer
Phil has been very active across the repository for a few months now.
He has not only triaged issues but also contributed to features and bug
fixes and is a very active participant on the project.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 30ede3632427338b4a80bdc0c4dac3d6fac630a1
Component: engine
2015-02-23 17:07:12 -08:00
eadcf24d19 Merge pull request #10936 from vincentbernat/fix/zsh-completion-update-3
zsh: update zsh completion for docker command
Upstream-commit: 09c4b4571225852692c1ac1beb8e9fe5209a62be
Component: engine
2015-02-23 16:01:59 -08:00
f3462cd410 Merge pull request #10933 from ahmetalpbalkan/version-daemon-os-arch
cli: Add server OS/Arch info to 'version' cmd
Upstream-commit: 02c888159666ee53df9eeb1397c7d597dabf3b60
Component: engine
2015-02-23 15:26:53 -08:00
10829092be Merge pull request #10908 from duglin/EnvDollarTest
Add a ENV tests with special chars in the values
Upstream-commit: fd185eddf625e810f6cb707df9297e4dfd70b7d0
Component: engine
2015-02-23 15:25:31 -08:00
5ac832ddd3 zsh: update zsh completion for docker command
zsh completion is updated with the content of
felixr/docker-zsh-completion.

ef4a3fce0437 Update completion for `wait' as per 1.5.0
ace5aa9c1282 Add completion for `stats'
91f112834865 Update completion for `search' as per 1.5.0
a5e4febe4bf6 Update completion for `save' as per 1.5.0
1cdbdb18a384 Add completion for `rename'
2f004bb724b9 Update completion for `pull' as per 1.5.0
773b88e0885b Update completion for `logs' as per 1.5.0
c57e5d5c4551 Update completion for `load' to favor archive files
9af7d12b487e Update completion for `images` as per 1.5.0
0d59e66aff30 update completion for `exec' to complete on commands
46b6c66760d7 Update completion for `events' as per 1.5.0
307e0bdc4c34 Update completion for `commit' as per 1.5.0
c4b331f38cc4 Update completion for `build' as per 1.5.0

Also added myself in the `MAINTAINERS` file.

Signed-off-by: Vincent Bernat <vincent@bernat.im>
Upstream-commit: 33fa1978799599f48694680ad6f73b7ecfaa924d
Component: engine
2015-02-24 00:16:30 +01:00
e430471f3b Merge pull request #10921 from duglin/FixNonverboseBuild
Build w/o verbose hangs w/RUN
Upstream-commit: ac06d0c46a26192c34a3ed782514652895fe5447
Component: engine
2015-02-23 15:15:12 -08:00
045a33063d Merge pull request #10938 from thaJeztah/update-copyright-year-in-notice
Update copyright year in NOTICE
Upstream-commit: b27bb2f255f60ce08d8d7b960f62027f7139c6e5
Component: engine
2015-02-23 15:12:38 -08:00