1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Ahmet Alp Balkan
4f377fbe9f 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>
2015-02-14 03:26:56 -08:00
Ahmet Alp Balkan
57d34241fd 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>
2015-02-14 03:00:38 -08:00
Ahmet Alp Balkan
5dbaea1ca9 integration-cli: remove timeout dependency on TestEventsUntag
TestEventsUntag requires a `timeout` command which does not
exist on OS X or Windows (in fact, windows has a totally different
timeout program and this test was accidentally using it).

- Created runCommandWithOutputForDuration.
  This entirely replaces runDockerCommandWithTimeout and
  removes dependency to `timeout` command.
- Made runDockerCommandWithTimeout reuse runDockerCommandForDuration.

TestEventsUntag works now on Windows.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-14 02:17:42 -08:00
Ahmet Alp Balkan
00cd214afe 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>
2015-02-13 23:26:08 -08:00
Ahmet Alp Balkan
48d8757700 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>
2015-02-13 22:12:06 -08:00
Fred Lifton
99ca215c65 Merge pull request #10752 from psftw/tweak-docs-readme
Clean up explanation of doc branches.
2015-02-13 17:20:59 -08:00
Stephen Day
244c19b850 Merge pull request #45 from icecrime/dist_binary_skeleton
Basic skeleton for `dist` binary
2015-02-13 16:30:31 -08:00
Stephen J Day
5d029fb807 Add error return to Repository method on Registry
The method (Registry).Repository may now return an error. This is too allow
certain implementationt to validate the name or opt to not return a repository
under certain conditions.

In conjunction with this change, error declarations have been moved into a
single file in the distribution package. Several error declarations that had
remained in the storage package have been moved into distribution, as well. The
declarations for Layer and LayerUpload have also been moved into the main
registry file, as a result.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-02-13 16:27:33 -08:00
Arnaud Porterie
168b51d402 Basic skeleton for dist binary
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-02-13 15:25:20 -08:00
Tianon Gravi
987050a52b 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>
2015-02-13 15:50:42 -07:00
Sean Li
d51d34ff0c Fixed image not updating during installer. 2015-02-13 13:42:44 -08:00
Doug Davis
b55346b327 Fix 'docker stats' help message
Closes #10771

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-02-13 12:45:50 -08:00
Fred Lifton
ee95aa1b81 Merge pull request #10674 from cpuguy83/cleanup_Dockerfile_manpage
Cleans up docs/man/Dockerfile.5.md
2015-02-13 12:42:19 -08:00
Phil Estes
6217f2944f 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)
2015-02-13 15:14:38 -05:00
Sean Li
318930d8a0 Installer patch and updated package.json 2015-02-13 11:53:44 -08:00
Jessie Frazelle
8b010d9f10 Merge pull request #10715 from icecrime/keyserver_install_dependency
Use gpg from our server if keyserver is down
2015-02-13 11:29:39 -08:00
Sean Li
99ae10ef1f Merge branch 'master' into sean-polish 2015-02-13 11:26:43 -08:00
Sean Li
f9f2dc6191 More informative error message. 2015-02-13 11:26:28 -08:00
Jeffrey Morgan
2c587445e9 Removing error if vmdestroy is called without VirtualBox 2015-02-13 11:26:11 -08:00
Andrea Luzzardi
a445ed952e Merge pull request #365 from vieux/add_cpus_mem
Add cpus mem
2015-02-13 11:24:07 -08:00
Sean Li
913658fcdd Navigation polish. 2015-02-13 11:16:13 -08:00
Victor Vieux
14674b47ec Merge pull request #388 from aluzzardi/dependency-filter
Dependency Filter: co-schedule dependent containers on the same node.
2015-02-13 10:59:13 -08:00
Victor Vieux
95c4d97380 Merge pull request #397 from bacongobbler/395-correct-irc-channel
correct IRC channel
2015-02-13 10:54:22 -08:00
Jeffrey Morgan
9b5b70f562 Merge 2015-02-13 10:44:09 -08:00
Jeffrey Morgan
c338678094 Merge remote-tracking branch 'origin/sean-polish'
Conflicts:
src/Radial.react.js
src/Setup.react.js
styles/radial.less
2015-02-13 10:44:00 -08:00
Jeffrey Morgan
e8f87e1ebe Merge pull request #177 from kitematic/setup-cancel
Install docker and boot2docker with Kitematic
2015-02-13 10:36:14 -08:00
Jessie Frazelle
4f24b77826 Merge pull request #10762 from coolljt0725/fix_check_config
Fix check-config.sh usage
2015-02-13 10:36:00 -08:00
Jessie Frazelle
070e1f238b Merge pull request #10763 from moul/patch-2
mkimage-alpine.sh: Allow to change ARCH from the environment
2015-02-13 10:35:35 -08:00
Jeffrey Morgan
4e3190c42c Cache dependencies 2015-02-13 10:28:23 -08:00
Jeffrey Morgan
bb3e6e6e1b Fix tests 2015-02-13 10:25:27 -08:00
Jeffrey Morgan
205a12041f removing unused requires 2015-02-13 10:03:23 -08:00
Alexander Morozov
7d65473b80 Merge pull request #10767 from cpuguy83/fix_racey_exec_cgroup_test
Fix race detected in TestExecCgroup
2015-02-13 09:54:06 -08:00
Brian Goff
14131b65c4 Cleans up docs/man/Dockerfile.5.md
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-13 12:47:58 -05:00
Brian Goff
8f5156e584 Fix race detected in TestExecCgroup
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-13 12:18:46 -05:00
Arnaud Porterie
f058e9c43c 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>
2015-02-13 09:13:29 -08:00
grossws
8017cb0d3b [trivial] changed ./hack to ./project in README.md
Signed-off-by: Konstantin Gribov <grossws@gmail.com>
2015-02-13 18:11:16 +03:00
Manfred Touron
75f1c440dd mkimage-alpine.sh: Allow to change ARCH from the environment
Signed-off-by: Manfred Touron <m@42.am>
2015-02-13 13:57:04 +01:00
Ben Firshman
2eb20d89af Merge pull request #904 from fredlf/install-doc-revision
Revision and edit of Compose install doc
2015-02-13 12:25:32 +00:00
Aanand Prasad
ab65c829ea Merge pull request #960 from bfirsh/remove-nathanleclaire-as-maintainer
Remove @nathanleclaire as a maintainer
2015-02-13 11:59:27 +00:00
Lei Jitang
82fda400b8 Fix check-config.sh usage
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-02-13 19:52:11 +08:00
Aanand Prasad
83110b8e6b Merge pull request #959 from bfirsh/tidy-up-contributing-guidelines
Tidy up contributing guidelines
2015-02-13 11:43:05 +00:00
Matthew Fisher
96274a9567 correct IRC channel
Signed-off-by: Matthew Fisher <matthewf@opdemand.com>
2015-02-13 03:13:34 -07:00
Harald Albers
3a8a25b9b3 Favour yml and yaml extensions in bash completion for -f
Signed-off-by: Harald Albers <github@albersweb.de>
2015-02-13 10:25:18 +01:00
Jeffrey Morgan
f3d719756b Fixing menu, adding Docker terminal 2015-02-13 00:03:25 -08:00
Andrew C. Bodine
0fadc9bd90 adds notify user of login credential persistence for registry
Signed-off-by: Andrew C. Bodine <acbodine@us.ibm.com>
2015-02-12 23:45:50 -08:00
Jeffrey Morgan
dc469af25c Install docker & boot2docker binaries with Kitematic 2015-02-12 22:51:26 -08:00
Stephen Day
b12d3c3bde Merge pull request #170 from stevvooe/move-layer-interfaces
Move registry interfaces into distribution package
2015-02-12 19:26:00 -08:00
Fred Lifton
aa073ac05e Merge pull request #10748 from icecrime/10739_update_docs
Update docs for HTTP_PROXY
2015-02-12 17:18:49 -08:00
Tibor Vass
2b5dfb3b01 Merge pull request #10755 from ahmetalpbalkan/win-cli/TestBuildAddTarXzGz-fix
TestBuildAddTarXz(Gz): call xz with '-k' due to bug
2015-02-12 19:25:43 -05:00
Ahmet Alp Balkan
2f53820ce4 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>
2015-02-12 15:42:27 -08:00