centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-04 18:28:58 +07:00
Code Issues Packages Projects Releases Wiki Activity
13,218 Commits 56 Branches 28 Tags
47e9f90be13d901c8fd6dfd0d77ec3f5debecada
Commit Graph

13218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessie Frazelle
47e9f90be1 Merge pull request #10794 from ahmetalpbalkan/win-cli/TestContainerApi-volume-path-fix 
integration-cli: Generate unix-style volume paths for tests
 2015-02-19 11:28:55 -08:00
Jessie Frazelle
d125936015 Merge pull request #10882 from LK4D4/fix_possible_panic_on_kill 
Fix possible panic on killing container
 2015-02-19 11:09:31 -08:00
Jessie Frazelle
a4b04544b7 Merge pull request #10901 from rseymour/patch-1 
calcuate -> calculate typo fix
 2015-02-19 10:34:05 -08:00
Jessie Frazelle
b9cb004c99 Merge pull request #10883 from md5/bash-completion-rename 
Add bash completion for "docker rename"
 2015-02-19 10:13:57 -08:00
Rich Seymour
ea8cb16af7 calcuate -> calculate typo fix 
Signed-off-by: Rich Seymour <rseymour@gmail.com>
 2015-02-19 12:44:38 -05:00
Jessie Frazelle
cd9769c55e Merge pull request #10806 from ahmetalpbalkan/win-cli/TestSave-fix 
integration-cli: use pipes for save/load tests
 2015-02-18 22:42:06 -08:00
Fred Lifton
9fe9d070c2 Merge pull request #10878 from jmtd/patch-1 
minor grammar suggestion
 2015-02-18 16:28:28 -08:00
Arnaud Porterie
306bb28569 Merge pull request #10785 from ahmetalpbalkan/win-cli/TestLinks-skip 
integration-cli: add const to skip daemon-requiring cli tests
 2015-02-18 15:13:05 -08:00
Mike Dillon
ded88a3170 Add bash completion for docker rename 
Signed-off-by: Mike Dillon <mike@embody.org>
 2015-02-18 11:49:05 -08:00
Alexander Morozov
e995670935 Fix possible panic on killing container 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-02-18 11:27:38 -08:00
Jessie Frazelle
eb0d65933d Merge pull request #10877 from unclejack/bump_go_to_1.4.2 
Dockerfile: bump Go to 1.4.2
 2015-02-18 08:51:15 -08:00
Jonathan Dowland
b7a1776878 minor grammar suggestion 
Signed-off-by: Jonathan Dowland <jdowland@redhat.com>
 2015-02-18 16:26:24 +00:00
unclejack
2f35f60348 Dockerfile: bump Go to 1.4.2 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-02-18 15:07:17 +02:00
Jessie Frazelle
2f024bd9e1 Merge pull request #10868 from ahmetalpbalkan/TestImagesFilterWhiteSpaceTrimmingAndLowerCasingWorking 
Use `-q` argument in test using `docker images -f`
 2015-02-17 23:22:12 -08:00
Ahmet Alp Balkan
e39ea834a9 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>
 2015-02-17 19:29:17 -08:00
James Turnbull
09b785f3be Merge pull request #10857 from pragmaticfrank/patch-1 
fix source command for tab-completion
 2015-02-17 20:22:06 -05:00
Ahmet Alp Balkan
b81105eaca 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>
 2015-02-17 17:09:09 -08:00
James Turnbull
6c4e1387d1 Merge pull request #10846 from chenhanxiao/pause-unpause-link 
docs: add See also for description of pause and unpause
 2015-02-17 19:26:56 -05:00
Sven Dowideit
3ba0d2985b Merge pull request #10845 from tianon/uhhhh 
Fix "upstream remote" dependence in Makefile
 2015-02-18 10:20:30 +10:00
Ferenc Szabo
112829434d 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>
 2015-02-17 16:53:18 +01:00
Ahmet Alp Balkan
df5334183f integration-cli: generate unix-style volume paths 
Some tests in `docker_api_containers_test.go` assume the
docker daemon is running at the same machine as the cli
and uses `ioutil.TempDir` to create temp dirs and use them
in the test.

On windows ioutil.TempDir and os.TempDir would create win-style
paths and pass them to daemon. Instead, I hardcoded `/tmp/` and
generate some random path manually and allow daemon to create
the directory.

Fixes tests:
- TestContainerApiStartVolumeBinds
- TestContainerApiStartDupVolumeBinds
- TestVolumesFromHasPriority

Downside:
- Does not clean the temp dirs generated on the remote daemon
  machine unless delete container deletes them.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-02-17 01:29:23 -08:00
Ahmet Alp Balkan
bc37c036b5 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>
 2015-02-17 00:43:41 -08:00
Chen Hanxiao
a69b189fc5 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>
 2015-02-17 10:22:28 +08:00
Tianon Gravi
d7ec4360c1 Fix "upstream remote" dependence in Makefile 
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-02-16 18:11:31 -07:00
Jessie Frazelle
2243e32cbb Merge pull request #10764 from grossws/patch-1 
Cleanup: changed ./hack to ./project in README.md
 2015-02-16 13:30:02 -08:00
Jessie Frazelle
4965304772 Merge pull request #10834 from albers/completion-fix-run--d 
Fix bash completion for docker run -d
 2015-02-16 12:01:39 -08:00
Jessie Frazelle
39df8473d6 Merge pull request #10796 from ahmetalpbalkan/win-cli/TestCliProxyDisableProxyUnixSock-fix 
integration-cli: use remote daemon env var in TestCliProxyDisableProxyUnixSock
 2015-02-16 11:59:46 -08:00
Jessie Frazelle
110ce4f6cd Merge pull request #10804 from ahmetalpbalkan/win-cli/TestRunSlowStdoutConsume-fix 
integration-cli: remove bash dependency of TestRunSlowStdoutConsumer
 2015-02-16 11:58:55 -08:00
Jessie Frazelle
3ddef31793 Merge pull request #10780 from estesp/test-bogus-link 
Fix daemon.Get() error handling with --link setup. Add test.
 2015-02-16 11:22:21 -08:00
Jessie Frazelle
9054e4dca3 Merge pull request #10779 from duglin/10771-FixStatsHelp 
Fix 'docker stats' help message
 2015-02-16 11:18:58 -08:00
Jessie Frazelle
8b58e73da4 Merge pull request #10820 from ahmetalpbalkan/small-nit 
Correct username in [Org."Core Maintainers"]
 2015-02-16 11:12:22 -08:00
Michael Crosby
bce2ae655c Merge pull request #10783 from tianon/BINDDIR-yes-two-Ds 
Rename BINDDIR to BIND_DIR
 2015-02-16 11:00:44 -08:00
Michael Crosby
c2effb259d Merge pull request #10615 from coolljt0725/fix_mount 
Fix create volume /etc cover /etc/{hosts,resolv.conf,hostname} Fixes # 10604
 2015-02-16 10:53:26 -08:00
Michael Crosby
73665ff5f2 Merge pull request #10633 from hqhq/hq_fix_memoryswap 
fix the problem that memory-swap=-1 is not working for docker command
 2015-02-16 10:49:01 -08:00
Michael Crosby
9ea20f260c Merge pull request #10571 from jfrazelle/8689-remove-all-aliases 
Removes the feature to pull all image aliases.
 2015-02-16 10:29:20 -08:00
Harald Albers
01bd90c4ad Fix bash completion for docker run -d 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-02-16 19:23:29 +01:00
Ahmet Alp Balkan
ae8f1fa712 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>
 2015-02-16 10:18:27 -08:00
Ahmet Alp Balkan
029ca9829d 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>
 2015-02-16 10:14:54 -08:00
Ahmet Alp Balkan
0ae1ef3b12 Correct username in org."Core Maintainers" 
My OCD has managed to catch this.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
 2015-02-16 10:13:12 -08:00
Michael Crosby
c6110bd48f Merge pull request #10829 from duglin/10828-UpdateCLIHelp 
Use newer help out for 'docker' and 'docker run'
 2015-02-16 10:13:00 -08:00
Jessie Frazelle
7e9dd94376 Merge pull request #10793 from ahmetalpbalkan/win-cli/TestExportContainerAndImportImage-fix 
integration-cli: use cmd.Stdin instead of cat/tee for TestExportContainerAndImportImage
 2015-02-16 10:11:47 -08:00
Jessie Frazelle
546f481840 Merge pull request #10795 from ahmetalpbalkan/integration-cli/makeRandomString 
integration-cli: Seed rand in makeRandomString
 2015-02-16 10:08:20 -08:00
Arnaud Porterie
9ee8d41ab2 Merge pull request #10800 from ahmetalpbalkan/TestRunEnv-fix 
integration-cli: Preserve DOCKER_TEST_HOST in env-clearing tests
 2015-02-16 09:23:42 -08:00
Arnaud Porterie
38ca779dd6 Merge pull request #10747 from ahmetalpbalkan/win-cli/TestContainersAttachWS-fix 
TestGetContainersAttachWebsocket: use DOCKER_TEST_HOST if specified
 2015-02-16 09:19:54 -08:00
Doug Davis
effa5e2c18 Use newer help out for 'docker' and 'docker run' 
Closes #10828

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

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
 2015-02-15 11:06:18 +08:00
Tibor Vass
c33ac6067c Merge pull request #10799 from ahmetalpbalkan/win-cli/TestRmiForceWithExistingContainers-fix 
integration-cli: fix test to use busybox outside container
 2015-02-14 15:47:55 -05:00
Cyril F
582c360d57 Smallest typo correction ever 
Signed-off-by: Cyril Francesconi <cyrilf7x@gmail.com>
 2015-02-14 17:51:28 +01:00