Commit Graph
13331 Commits
Author SHA1 Message Date
Doug Davis 7a0aaa5999 Use newer help out for 'docker' and 'docker run'
Closes #10828

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: effa5e2c18f27b81fc46d1a925d04e6af5695459
Component: engine
2015-02-16 08:46:07 -08:00
James Turnbull 5beb4d62d0 Merge pull request #10801 from cyrilf/patch-1
Documentation - smallest typo correction ever
Upstream-commit: 924b7154baa94e639b8655087e4ba5a5cf0125a4
Component: engine
2015-02-15 20:38:45 -05:00
Doug Davis 09c2461936 Merge pull request #10808 from chenhanxiao/man-Dockerfile-typo
docs: fix a typo in Dockerfile.5.md
Upstream-commit: 028968f1a2de966fdabcc76244d8a57ea68da411
Component: engine
2015-02-15 07:48:29 -05:00
Chen Hanxiao 564ab376d9 docs: fix a typo in Dockerfile.5.md
s/Exececutable/Executable

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: bfba622f86eb45e25d4ff6dc6808cd740bd2a671
Component: engine
2015-02-15 11:06:18 +08:00
Tibor Vass 9dc08d266a Merge pull request #10799 from ahmetalpbalkan/win-cli/TestRmiForceWithExistingContainers-fix
integration-cli: fix test to use busybox outside container
Upstream-commit: c33ac6067cdf50fc1dc284cdf9c634efff27ab2e
Component: engine
2015-02-14 15:47:55 -05:00
Cyril F 6fae379b61 Smallest typo correction ever
Signed-off-by: Cyril Francesconi <cyrilf7x@gmail.com>
Upstream-commit: 582c360d5741a6dce35af1e7607ee636bcf4eb4c
Component: engine
2015-02-14 17:51:28 +01:00
James Turnbull ddfca8a551 Merge pull request #10757 from thaJeztah/docs-enhance-volume-lifecycle-description
Docs: Improve description on volume removal
Upstream-commit: 9456a2541462c3cbf8afca8e14f3102887566dd7
Component: engine
2015-02-14 11:08:28 -05:00
Sebastiaan van Stijn 474b56bd0a Docs: Improve description on volume removal
A comment in https://github.com/docker/docker/issues/6354#issuecomment-74160215
brought to light that the "Managing Data in containers" section contained an
incorrect (or confusing) line;

  "Volumes persist until no containers use them"

Which implies that volumes are automatically removed if they are no longer
referenced by a container.

This pull-request attempts to add some information explaining that volumes are
never automatically removed by Docker and adds some extra hints on working
with data volumes.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 00f2fd1dd5dee53919cda7ed9f5c70ba8558edb5
Component: engine
2015-02-14 17:04:06 +01:00
Ahmet Alp Balkan b18c3b3d5b docker_cli_run_test: Preserve DOCKER_TEST_HOST in env-clearing tests
For Windows, we run integration-cli with DOCKER_TEST_HOST env var b/c
daemon is on some remote machine. This keeps the DOCKER_HOST set by
bash scripts in the env.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 4f377fbe9f30ea44be5e10a0c7b9bc3c6eb421b1
Component: engine
2015-02-14 03:26:56 -08:00
Ahmet Alp Balkan 5172176fa3 integration-cli: fix test to use busybox outside container
Fixes TestRmiForceWithExistingContainers test to make it use
`busybox` image rather than /docker-busybox hardcoded path
and rebuilding image.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 57d34241fdff146eaeae748c959940489335ed2a
Component: engine
2015-02-14 03:00:38 -08:00
Ahmet Alp Balkan 0c27972573 integration-cli: seed rand in makeRandomString
Current uses of `makeRandomString` is to create really
long strings. In #10794, I used them to create nearly-unique
unix paths for the daemon. Although collions are harmless and
don't fail the tests, this prevents the same strings from being
created consistently in every run by seeding rand.Random.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 00cd214afe46e79848e0f807bcdd19c20251cd2f
Component: engine
2015-02-13 23:26:08 -08:00
Ahmet Alp Balkan 63d3034a03 integration-cli: use cmd.Stdin instead of cat/tee for TestExportContainerAndImportImage
os.Exec("bash", "-c", dockerBinary) ends up making a call like
bash -c c:\...\docker.exe on windows msys shell, which does not work.

This test makes use of exec.Command.Stdin to pass image back to
docker import.

- Upside: fixes the test on windows
- Downside: cat/tee compatibility is no longer tested in this test case

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 48d8757700f876ffdeb22d76261128238a8f7a17
Component: engine
2015-02-13 22:12:06 -08:00
Fred Lifton 3de3653c91 Merge pull request #10752 from psftw/tweak-docs-readme
Clean up explanation of doc branches.
Upstream-commit: 99ca215c65e9a482f981790f2d4dbe8d4ccce4be
Component: engine
2015-02-13 17:20:59 -08:00
Tianon Gravi ac657c8159 Rename BINDDIR to BIND_DIR
It turns out the back-to-back `D`s here were tripping people up because visually, it looks like a typo.  This renames the variable to `BIND_DIR`, but allows `BINDDIR` to continue working for backwards-compatibility.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 987050a52b0ce6d5ae77554a03af5923304bd3e5
Component: engine
2015-02-13 15:50:42 -07:00
Doug Davis 79ea7dd989 Fix 'docker stats' help message
Closes #10771

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b55346b3279a3243da8cab82a7ddc427454aba61
Component: engine
2015-02-13 12:45:50 -08:00
Fred Lifton ab722f0215 Merge pull request #10674 from cpuguy83/cleanup_Dockerfile_manpage
Cleans up docs/man/Dockerfile.5.md
Upstream-commit: ee95aa1b813f53d52e42a7d37a3f4988918058ce
Component: engine
2015-02-13 12:42:19 -08:00
Phil Estes a7d8fdce1c Fix daemon.Get error handling with --link setup. Add test.
Fixes newly introduced error flow from daemon.Get() in the link setup
code.  Also added more detail to daemon.Get() comments for clarity.
Added test to test the bogus container link codepath.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 6217f2944f7e9aea4a81615102b7c68740db9350
Component: engine
2015-02-13 15:14:38 -05:00
Jessie Frazelle bebced9dfc Merge pull request #10715 from icecrime/keyserver_install_dependency
Use gpg from our server if keyserver is down
Upstream-commit: 8b010d9f10b42377bcd741dfbe00006994bd8adc
Component: engine
2015-02-13 11:29:39 -08:00
Jessie Frazelle 6a9a983a60 Merge pull request #10762 from coolljt0725/fix_check_config
Fix check-config.sh usage
Upstream-commit: 4f24b77826227a17048432a51d728a5ea05dceaa
Component: engine
2015-02-13 10:36:00 -08:00
Jessie Frazelle ca718cde6f Merge pull request #10763 from moul/patch-2
mkimage-alpine.sh: Allow to change ARCH from the environment
Upstream-commit: 070e1f238b281a1813ee0b6f7d3adaee72e0c75d
Component: engine
2015-02-13 10:35:35 -08:00
Alexander Morozov a14f48da41 Merge pull request #10767 from cpuguy83/fix_racey_exec_cgroup_test
Fix race detected in TestExecCgroup
Upstream-commit: 7d65473b809d8a1ee2f1014139707d50a737f1af
Component: engine
2015-02-13 09:54:06 -08:00
Brian Goff b108618571 Cleans up docs/man/Dockerfile.5.md
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 14131b65c41ee9f562c3311e533e0f7d9c9de97b
Component: engine
2015-02-13 12:47:58 -05:00
Brian Goff b8d956b4d4 Fix race detected in TestExecCgroup
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 8f5156e584233f3e83cfc889583fa016aabfeea9
Component: engine
2015-02-13 12:18:46 -05:00
Arnaud Porterie da0bb2cbb5 Use gpg keyserver pool
Make the install script independent from the ubuntu keyserver by using
the sks-keyservers pool instead.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f058e9c43c8752dedcd4d251ddf105b22d0ed1d5
Component: engine
2015-02-13 09:13:29 -08:00
grossws 236e9294ed [trivial] changed ./hack to ./project in README.md
Signed-off-by: Konstantin Gribov <grossws@gmail.com>
Upstream-commit: 8017cb0d3b0fdb1dc9367b8445b3bc456d4666c7
Component: engine
2015-02-13 18:11:16 +03:00
Manfred Touron 935df32156 mkimage-alpine.sh: Allow to change ARCH from the environment
Signed-off-by: Manfred Touron <m@42.am>
Upstream-commit: 75f1c440dd9332d28d33585bf16e05a7647412c9
Component: engine
2015-02-13 13:57:04 +01:00
Lei Jitang 44be94d7d0 Fix check-config.sh usage
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 82fda400b8a2528b1b90e64fc4be6827afbd04ed
Component: engine
2015-02-13 19:52:11 +08:00
Fred Lifton 1d7249f857 Merge pull request #10748 from icecrime/10739_update_docs
Update docs for HTTP_PROXY
Upstream-commit: aa073ac05e6171ddfbaca4977f002b821a45f556
Component: engine
2015-02-12 17:18:49 -08:00
Tibor Vass a135d71f5e Merge pull request #10755 from ahmetalpbalkan/win-cli/TestBuildAddTarXzGz-fix
TestBuildAddTarXz(Gz): call xz with '-k' due to bug
Upstream-commit: 2b5dfb3b01605f6ec91efd9a5c2f67166fcd9ff5
Component: engine
2015-02-12 19:25:43 -05:00
Ahmet Alp Balkan 01e622e5b7 TestBuildAddTarXz: xz with '-k' due to msys bug
TestBuildAddTarXz/TestBuildAddTarXzGz make exec calls like
'cd %SOME_TEMP_DIR%; xz test.gz' but this fails when called
from integration-cli tests (doesn't fail from msys or cmd shell).

It fails with error: "xz: test.tar: Cannot remove: Permission denied."
Proposing workaround of using the `xz --keep` argument since keeping
test.tar is harmless and it's already in os.TempDir().

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 2f53820ce409ce1afb6513b7799d094b9c53779d
Component: engine
2015-02-12 15:42:27 -08:00
Tianon Gravi 82c4bb4849 Merge pull request #10716 from ahmetalpbalkan/win-cli/fix-emptyfs-path
Change emptyfs path in integration-cli tests
Upstream-commit: 65623e22aa79b6974f8fc4f0384a7533cbb9c570
Component: engine
2015-02-12 15:29:48 -08:00
Ahmet Alp Balkan b8472e6ec6 docker_api_attach_test: fix WS test to use DOCKER_TEST_HOST if specified
TestGetContainersAttachWebsocket is currently broken on Windows CI tests
b/c it has hardcoded unix://var/run/docker.sock.  This change makes use
of @icecrime's code in docker_utils and generalizes it with sockConn()
to provide a net.Conn by making use of DOCKER_TEST_HOST. Also fixes
the test.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: ac6cb41d52ca229d2b628ab0bb5ef6103bd86ce1
Component: engine
2015-02-12 15:11:19 -08:00
Ahmet Alp Balkan 8f945cfefd Change emptyfs path in integration-cli tests
This fixes the build break in Jenkins Windows CI tests and
fixes TestInspectImage for Windows CLI.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: e1be475c5b3269246d5ecaf2b7943608941cc966
Component: engine
2015-02-12 15:02:18 -08:00
Doug Davis 3799fccfba Merge pull request #10727 from ahmetalpbalkan/win-cli/integration-cli-compile-fix
Create builder/command, cut libcontainer dependency on integration-cli
Upstream-commit: 802802b7812b7c73aefec4e922cad82f8dcddd4c
Component: engine
2015-02-12 17:10:16 -05:00
Peter Salvatore ba30fcef2a Clean up explanation of doc branches.
Signed-off-by: Peter Salvatore <peter@psftw.com>
Upstream-commit: 74b050bd0cfa897c0ef2fa50e26725af3c29a65e
Component: engine
2015-02-12 17:02:56 -05:00
Arnaud Porterie 2c48e42531 Update docs for HTTP_PROXY
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 7a7c00ca0834e6bad0132d834399bcee4d3b957b
Component: engine
2015-02-12 11:40:56 -08:00
Arnaud Porterie 29f194cb0b Merge pull request #10739 from cpuguy83/fix_do_not_proxy_unix_sock
Do not use HTTP_PROXY for unix sock
Upstream-commit: d8f60a6cf7790b8951fdb1c5af2ca2aef5353ec6
Component: engine
2015-02-12 11:33:46 -08:00
Michael Crosby 893e1b6f39 Merge pull request #10694 from dmcgowan/remove-push-by-id
Remove push by ID
Upstream-commit: 3eb1939b699efe5bde16922b0668c46f8e9d47c9
Component: engine
2015-02-12 11:25:38 -08:00
Brian Goff 106678e894 Do not use HTTP_PROXY for unix sock
Makes sure the CLI does not use HTTP_PROXY when connecting to unix
socket.
Also adds some tests to make sure this functionality works as expected.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f6e697d2ace2ea659c1b3f7e3dcef7493baa481c
Component: engine
2015-02-12 11:38:52 -05:00
Ahmet Alp Balkan dbc9971c4a builder/parser: Make use of builder/command
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 72a070c5da8b6fe832794a6de37aace7f9b93306
Component: engine
2015-02-11 23:54:41 -08:00
Ahmet Alp Balkan b2dfebba9a Create builder/command, cut libcontainer dependency on integration-cli
d1e9d07c introduces a dependency to libcontainer and other daemon
related packages through builder package. The only thing test needs
is set of the Dockerfile commands. Extracting them to a separate
package.

This was causing CI tests to not to compile on non-Linux platforms.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: ccde3a1f73bb4f64845e736d3173eb6f6935971f
Component: engine
2015-02-11 21:44:31 -08:00
Sven Dowideit 65fed30f0c Tweak the text a little
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: d79e597f301fdf42a0f441f35b48504a5b07eb8b
Component: engine
2015-02-12 12:39:41 +10:00
Sven Dowideit 55e028de55 update the test code to enable testing the extra info
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 49d1ab0eb2ab5ed880e2e1ed66bb62c68b801457
Component: engine
2015-02-12 12:39:41 +10:00
Greg Fausak 683246a195 added -extfile to server certificate documentation for support of
subjectAltName=IP:x.x.x.x
this allows for connecting to the docker server from docker client
using the dns name OR using the IP address (lots of docker stuff
prefers IP addresses)

Signed-off-by: Greg Fausak <greg@tacodata.com>
Upstream-commit: df8d80710297385aa7c8db41fdd1ef6795e39ae3
Component: engine
2015-02-12 12:39:41 +10:00
Lei Jitang b4e1974dec Add tests for create /etc volume
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: f3713010dd6355cc89944cc4185b4c5023fd95c5
Component: engine
2015-02-12 10:39:07 +08:00
Lei Jitang e0226dfb31 Fix create volume /etc cover /etc/{hosts,resolv.conf,hostname}
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: fa228d8cbc3778a9abbab49208b60b31bf026621
Component: engine
2015-02-12 08:46:53 +08:00
Jessie Frazelle ebb652c696 Merge pull request #10686 from LK4D4/bump_docs
Bump api version to 1.18
Upstream-commit: f4749acad48f03454c951081a0a3f0149a23e260
Component: engine
2015-02-11 11:01:28 -08:00
Tibor Vass c13ff18007 Merge pull request #10670 from tianon/revert-10290-sorry-windows-norelease4u
Revert "Remove windows from the list of supported platforms"
Upstream-commit: df7a04f9a64fc7b8e528a3b99beb71b97b4b22d0
Component: engine
2015-02-11 13:54:34 -05:00
Jessie Frazelle a2081fdfa4 Merge pull request #10596 from rhvgoyal/manifest-close-archive
manifest: Close archive once done to umount the device backing the layer
Upstream-commit: 3e039e8748f9783516183f729f85e26cfe9de9d9
Component: engine
2015-02-11 09:05:26 -08:00
Vivek Goyal 5407924e49 docker-call-close-archive-in-push-v2-image
pushV2Image() calls TarLayer() which returns an archive. One needs to
Close() the archive once done otherwise it will leave mounted devices
if devicemapper graph driver is being used.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> 
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 064ff42d6d34b9c92e634f30ac1549d9786ab26f
Component: engine
2015-02-11 11:30:46 -05:00