Commit Graph

12208 Commits

Author SHA1 Message Date
eba1bf9a43 Merge pull request #10785 from ahmetalpbalkan/win-cli/TestLinks-skip
integration-cli: add const to skip daemon-requiring cli tests
Upstream-commit: 306bb28569c6554205d9ff609d66a09d47af5249
Component: engine
2015-02-18 15:13:05 -08:00
fd73e8b011 Dockerfile: bump Go to 1.4.2
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 2f35f60348663b3775f038eadea4fccbd0591725
Component: engine
2015-02-18 15:07:17 +02:00
aa71246181 Use -q param in test using docker images -f
The test case `TestImagesFilterWhiteSpaceTrimmingAndLowerCasingWorking`
fails based on time because it uses full `docker images` output and
value in the `CREATED` column turns from `A minute ago` to `2 minutes ago`
in the middle of execution and output comparison fails.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: e39ea834a92154574be3dde67ae30acdb25b32f7
Component: engine
2015-02-17 19:29:17 -08:00
d3be715b86 Merge pull request #10857 from pragmaticfrank/patch-1
fix source command for tab-completion
Upstream-commit: 09b785f3bed812736fe7526535088ca73c1fa10d
Component: engine
2015-02-17 20:22:06 -05:00
9067686a86 Merge pull request #10846 from chenhanxiao/pause-unpause-link
docs: add See also for description of pause and unpause
Upstream-commit: 6c4e1387d143f8f78738b9e54e7ea761588e3a62
Component: engine
2015-02-17 19:26:56 -05:00
5fc38e9a3e fix source command for tab-completion
source /etc/bash_completion.d/docker.io was not working for me, since the file is called docker, not docker.io.

There might be versions with 'io' ending; star is general enough.

Signed-off-by: Ferenc Szabo <pragmaticfrank@gmail.com>
Upstream-commit: 112829434d5aa517a00d89c3b476233fa277eb94
Component: engine
2015-02-17 16:53:18 +01:00
3d483b4bef integration-cli: add mechanism to skip tests
If DOCKER_CLIENTONLY is set for test-integration-cli, we don't set
the 'daemon' build tag. 'isRemoteDaemon' will help us skip such
tests without a need to move them to a separate file and accidentally
lose track of them.

Added `testRequires` function to skip tests based on predefined
conditions evaluated in runtime. This way we can easily extend test
requirements like:

    testRequires(t, Networking, SameHostDaemon, Linux)

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: bc37c036b568f9ae27a7aa457ec73d0c5c6a61cf
Component: engine
2015-02-17 00:43:41 -08:00
ee82c91c8a docs: add See Also for description of pause and unpause
make them reference to each other.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: a69b189fc5796248bedc01a9feb34da765c73547
Component: engine
2015-02-17 10:22:28 +08:00
5d5a391206 Fix "upstream remote" dependence in Makefile
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: d7ec4360c14421c146642f0a514e829207607f1a
Component: engine
2015-02-16 18:11:31 -07:00
238e12f3fa Merge pull request #10764 from grossws/patch-1
Cleanup: changed ./hack to ./project in README.md
Upstream-commit: 2243e32cbbf1c9809c262a7376d34ca43a7a36dc
Component: engine
2015-02-16 13:30:02 -08:00
d34f521d2c Merge pull request #10834 from albers/completion-fix-run--d
Fix bash completion for docker run -d
Upstream-commit: 4965304772e6a5493a86fbfa1574e88dbaa57879
Component: engine
2015-02-16 12:01:39 -08:00
8e15b333c1 Merge pull request #10796 from ahmetalpbalkan/win-cli/TestCliProxyDisableProxyUnixSock-fix
integration-cli: use remote daemon env var in TestCliProxyDisableProxyUnixSock 
Upstream-commit: 39df8473d6fdfd1afed3dc9361327b39a3804798
Component: engine
2015-02-16 11:59:46 -08:00
7dcc838aea Merge pull request #10804 from ahmetalpbalkan/win-cli/TestRunSlowStdoutConsume-fix
integration-cli: remove bash dependency of TestRunSlowStdoutConsumer
Upstream-commit: 110ce4f6cdf7c5a2409a6075d783f5af76ba190e
Component: engine
2015-02-16 11:58:55 -08:00
e082c90ce2 Merge pull request #10780 from estesp/test-bogus-link
Fix daemon.Get() error handling with --link setup. Add test.
Upstream-commit: 3ddef31793b45b3891f5b9955254b0167ebe7cba
Component: engine
2015-02-16 11:22:21 -08:00
bc6bb1e0e5 Merge pull request #10779 from duglin/10771-FixStatsHelp
Fix 'docker stats' help message
Upstream-commit: 9054e4dca3320ec769a02aed8c19aac577688992
Component: engine
2015-02-16 11:18:58 -08:00
0703e25d8b Merge pull request #10820 from ahmetalpbalkan/small-nit
Correct username in [Org."Core Maintainers"]
Upstream-commit: 8b58e73da429b664ed2dbec7c0caab1fb8a45ccd
Component: engine
2015-02-16 11:12:22 -08:00
53251d070b Merge pull request #10783 from tianon/BINDDIR-yes-two-Ds
Rename BINDDIR to BIND_DIR
Upstream-commit: bce2ae655cea2fe2a57225abb30bce2bf85adfa5
Component: engine
2015-02-16 11:00:44 -08:00
afb29d0720 Merge pull request #10615 from coolljt0725/fix_mount
Fix create volume /etc cover /etc/{hosts,resolv.conf,hostname} Fixes # 10604
Upstream-commit: c2effb259d18edb6b82d43e4f0eb22e81ce4658f
Component: engine
2015-02-16 10:53:26 -08:00
20acfabece Merge pull request #10633 from hqhq/hq_fix_memoryswap
fix the problem that memory-swap=-1 is not working for docker command
Upstream-commit: 73665ff5f2b0805bb8b53b2acf7e881ebe97225e
Component: engine
2015-02-16 10:49:01 -08:00
4a9bcf2320 Merge pull request #10571 from jfrazelle/8689-remove-all-aliases
Removes the feature to pull all image aliases.
Upstream-commit: 9ea20f260c0a31d6a0e939a099f7005e93507eea
Component: engine
2015-02-16 10:29:20 -08:00
11e97d1f42 Fix bash completion for docker run -d
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 01bd90c4ad5322d443d6952c897dd6ba8d17a3ba
Component: engine
2015-02-16 19:23:29 +01:00
3a93af60b3 integration-cli: remove bash dependency of TestRunSlowStdoutConsumer
This makes this test case run on msys bash on windows or
cmd.exe.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: ae8f1fa712196474da633b4c832ea073e8995edb
Component: engine
2015-02-16 10:18:27 -08:00
d9411855ac integration-cli: use remote daemon in proxy test
TestCliProxyDisableProxyUnixSock runs `docker info` by
clearing env however if the daemon is set up to run in a
different machine (e.g. Windows CI case) it does not make
use of DOCKER_TEST_HOST and tries to connect unix sock.

This fix injects DOCKER_HOST back to the test.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 029ca9829df1d42a67289e0318db416cdbcfaf35
Component: engine
2015-02-16 10:14:54 -08:00
b5069da713 Correct username in org."Core Maintainers"
My OCD has managed to catch this.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 0ae1ef3b12f2599c05835cab6485b3518feef461
Component: engine
2015-02-16 10:13:12 -08:00
12009fc9d6 Merge pull request #10829 from duglin/10828-UpdateCLIHelp
Use newer help out for 'docker' and 'docker run'
Upstream-commit: c6110bd48f75911dde94559b74010b881d32ac5d
Component: engine
2015-02-16 10:13:00 -08:00
5d57256889 Merge pull request #10793 from ahmetalpbalkan/win-cli/TestExportContainerAndImportImage-fix
integration-cli: use cmd.Stdin instead of cat/tee for TestExportContainerAndImportImage
Upstream-commit: 7e9dd943761508c9302cc55fd8b726cc55467a88
Component: engine
2015-02-16 10:11:47 -08:00
57b0301286 Merge pull request #10795 from ahmetalpbalkan/integration-cli/makeRandomString
integration-cli: Seed rand in makeRandomString
Upstream-commit: 546f48184035374af7c417cc9de95fdd2d02bc89
Component: engine
2015-02-16 10:08:20 -08:00
e4b06c20d3 Merge pull request #10800 from ahmetalpbalkan/TestRunEnv-fix
integration-cli: Preserve DOCKER_TEST_HOST in env-clearing tests
Upstream-commit: 9ee8d41ab27181a919da11828c573c030e8a5611
Component: engine
2015-02-16 09:23:42 -08:00
aeb3d73e62 Merge pull request #10747 from ahmetalpbalkan/win-cli/TestContainersAttachWS-fix
TestGetContainersAttachWebsocket: use DOCKER_TEST_HOST if specified
Upstream-commit: 38ca779dd683c728cbfc1486375816ddd8853bb6
Component: engine
2015-02-16 09:19:54 -08:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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