Commit Graph
13216 Commits
Author SHA1 Message Date
Jessie Frazelle 6f46f00656 Merge pull request #10882 from LK4D4/fix_possible_panic_on_kill
Fix possible panic on killing container
Upstream-commit: d12593601558ca090864b54e1a2e519f6763e2fb
Component: engine
2015-02-19 11:09:31 -08:00
Jessie Frazelle b9f8b5c826 Merge pull request #10901 from rseymour/patch-1
calcuate -> calculate typo fix
Upstream-commit: a4b04544b734a031a482f8697cb634a9394f987d
Component: engine
2015-02-19 10:34:05 -08:00
Jessie Frazelle 4f323b8a4b Merge pull request #10883 from md5/bash-completion-rename
Add bash completion for "docker rename"
Upstream-commit: b9cb004c99064700bd19520533dcd402ed8dd84c
Component: engine
2015-02-19 10:13:57 -08:00
Rich Seymour 2b138a5eaf calcuate -> calculate typo fix
Signed-off-by: Rich Seymour <rseymour@gmail.com>
Upstream-commit: ea8cb16af7e8c83a264a1d1c48db3cacd4cc082b
Component: engine
2015-02-19 12:44:38 -05:00
Jessie Frazelle fbfe910172 Merge pull request #10806 from ahmetalpbalkan/win-cli/TestSave-fix
integration-cli: use pipes for save/load tests
Upstream-commit: cd9769c55e3c0c405854b84c2c4bd273be79b23d
Component: engine
2015-02-18 22:42:06 -08:00
Fred Lifton 2040bae062 Merge pull request #10878 from jmtd/patch-1
minor grammar suggestion
Upstream-commit: 9fe9d070c244af05781671336c056f676d5d2ed7
Component: engine
2015-02-18 16:28:28 -08:00
Arnaud Porterie 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
Mike Dillon 5bbe01e609 Add bash completion for docker rename
Signed-off-by: Mike Dillon <mike@embody.org>
Upstream-commit: ded88a3170749cc2661c8a48a6d1398faad0fe5c
Component: engine
2015-02-18 11:49:05 -08:00
Alexander Morozov 79286179ed Fix possible panic on killing container
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e995670935118ad7ff485aee7fd3d4767e4c3e29
Component: engine
2015-02-18 11:27:38 -08:00
Jessie Frazelle 7aa016c918 Merge pull request #10877 from unclejack/bump_go_to_1.4.2
Dockerfile: bump Go to 1.4.2
Upstream-commit: eb0d65933dbb7fae54d8acd5a1f060957c9b48c2
Component: engine
2015-02-18 08:51:15 -08:00
Jonathan DowlandandJonathan Dowland dc2c1ecb5d minor grammar suggestion
Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
Upstream-commit: b7a1776878d4851019c65edee1df10fda530dc9a
Component: engine
2015-02-18 16:26:24 +00:00
unclejack 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
Jessie Frazelle 7b0edd44f7 Merge pull request #10868 from ahmetalpbalkan/TestImagesFilterWhiteSpaceTrimmingAndLowerCasingWorking
Use `-q` argument in test using `docker images -f`
Upstream-commit: 2f024bd9e1d0c0ba13e915c486d0c3cd7c2e68bb
Component: engine
2015-02-17 23:22:12 -08:00
Ahmet Alp Balkan 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
James Turnbull 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
Ahmet Alp Balkan 6e1d109cda integration-cli: use pipes for save/load tests
This removes `bash` dependency from save/load integration tests.
It used to call `/bin/bash -c 'c:\...\docker.exe'` which is not valid.
Also removed usage of tempdirs and temp files for saving/loading
repos. All are now done using in-memory pipes and buffers.

Created `runCommandPipelineWithOutput` helper to replace the
`/bin/bash -c 'a | b | c'` using pipes and returning output from
last command in the pipeline. This makes the code even shorter
and readable.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: b81105eaca56e7b22c97e24b7314419ee0a4f2a9
Component: engine
2015-02-17 17:09:09 -08:00
James Turnbull 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
Sven Dowideit ca6921e4c7 Merge pull request #10845 from tianon/uhhhh
Fix "upstream remote" dependence in Makefile
Upstream-commit: 3ba0d2985b7fda1fdd69611ad599de9370878fa5
Component: engine
2015-02-18 10:20:30 +10:00
Ferenc Szabo 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
Ahmet Alp BalkanandAhmet Alp Balkan 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
Chen Hanxiao 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
Tianon Gravi 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
Jessie Frazelle 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
Jessie Frazelle 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
Jessie Frazelle 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
Jessie Frazelle 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
Jessie Frazelle 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
Jessie Frazelle 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
Jessie Frazelle 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Harald Albers 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
Ahmet Alp Balkan 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
Ahmet Alp BalkanandAhmet Alp Balkan 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
Ahmet Alp Balkan 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
Michael Crosby 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
Jessie Frazelle 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
Jessie Frazelle 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
Arnaud Porterie 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
Arnaud Porterie 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
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