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
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
Tianon Gravi
ed345fb18e Run tests in stricter environment
Use `env -i` to very explicitly control exactly which environment variables leak into our tests.  This enforces a clean separation of "build environment knobs" versus "test suite knobs".

This also includes a minor tweak to how we handle starting our integration daemon, especially to catch failure to start sooner than failing tests.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-02-18 23:30:43 -07:00
Victor Vieux
ff22cbc2d3 fix panic in token discovery
Signed-off-by: Victor Vieux <vieux@docker.com>
2015-02-18 22:08:07 -08:00
Fred Lifton
9fe9d070c2 Merge pull request #10878 from jmtd/patch-1
minor grammar suggestion
2015-02-18 16:28:28 -08:00
Lance Kinley
c15970eff9 Patch mkimage-yum.sh to work with Amazon Linux (2014.09)
Signed-off-by: Lance Kinley <lkinley@loyaltymethods.com>
2015-02-18 15:17:15 -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
Doug Davis
c42d2625d1 Add more tests around using -f Dockerfile via the CLI
Mainly to make sure we don't treat the -f value as relative to the
root of the build context, but instead it must be relative to the current
dir.

Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-02-18 14:06:58 -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
Shishir Mahajan
c1deb7f524 man page description for -c/--cpu-shares flag for docker run command
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-02-18 14:01:55 -05:00
Sean Li
cc50c7a446 Hide scroll bar for mini logs. 2015-02-18 09:43:10 -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
Bradley Cicenas
06c01b02f5 add logpath to docker inspect.
Signed-off-by: Bradley Cicenas <bradley.cicenas@gmail.com>
2015-02-18 10:19:52 -05:00
Evan Hazlett
8a18155d72 Merge pull request #551 from cloudnativeapps/GH-547
Custom VMware ISO for B2D 1.5.0
2015-02-18 07:03:14 -08: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
Aanand Prasad
a516d61b49 Update environment variable names in docs
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-02-18 11:39:57 +00:00
Aanand Prasad
6eb1c8896f Merge pull request #952 from fredlf/cli-doc-revision
Revises Compose cli reference
2015-02-18 11:38:50 +00:00
Ahmet Alp Balkan
c5b312dcf5 integ-cli: Fix path issues in docker cp tests
Some of the `docker cp` tests were using `path/filepath` to
craft unix paths. This wouldn't work on Windows since filepath
is platform-dependent.

Moved code to `path` as much as possible and hacked away some
`path/filepath` functionality that doesn't exist in `path` pkg.

This fixes the following test cases:
- `TestCpGarbagePath`
- `TestCpRelativePath`
- `TestCpAbsoluteSymlink`
- `TestCpSymlinkComponent`

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-18 02:27:44 -08:00
Fabio Rapposelli
13b60b19f7 Updated custom ISOs for B2D w/ vmtoolsd and format-blank-drive patches.
Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
2015-02-18 11:26:11 +01:00
Ben Firshman
160e2dc7b9 Merge pull request #949 from aanand/update-intro
Rejig introduction
2015-02-18 09:46:16 +00:00
Ahmet Alp Balkan
c1a54048e2 integration-cli: remove bash dependency from TestRunSetMacAddress
This change enables TestRunSetMacAddress to run on windows
without `bash` dependency. Also `defer`red call of cleanup
method.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-17 23:24:36 -08: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
Ahmet Alp Balkan
28842d3f09 pkg/archive: Canonicalize stored paths
Currently pkg/archive stores nested windows files with
backslashes (e.g. `dir\`, `dir\file.txt`) and this causes
tar not being correctly extracted on Linux daemon.

This change assures we canonicalize all paths to unix
paths and add them to tar with that name independent of platform.

Fixes the following test cases for Windows CI:
- TestBuildAddFileWithWhitespace
- TestBuildCopyFileWithWhitespace
- TestBuildAddDirContentToRoot
- TestBuildAddDirContentToExistingDir
- TestBuildCopyDirContentToRoot
- TestBuildCopyDirContentToExistDir
- TestBuildDockerignore
- TestBuildEnvUsage
- TestBuildEnvUsage2

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-02-17 16:51:04 -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
Jeffrey Morgan
d152005f17 Fixing build 2015-02-17 16:19:51 -08:00
Jeffrey Morgan
df559a845f Merge pull request #191 from kitematic/setup-polish
UI Polish
2015-02-17 16:15:05 -08:00
Jeffrey Morgan
e8f62ab4d3 Hiding horizontal scrollbar 2015-02-17 16:14:43 -08:00
Mary Anthony
112aa1e341 Fixing spacing after period 2015-02-17 16:10:32 -08:00
Jeffrey Morgan
61944b7a2c Fix flash of big image 2015-02-17 16:09:43 -08:00
Mary Anthony
1b36272dc3 Adding in Fred's comments. 2015-02-17 15:59:29 -08:00
Mary Anthony
abc6896984 Tweaking language 2015-02-17 11:02:25 -08:00
Mary Anthony
0581e8652d Updating per Sven's request for localhost definition 2015-02-17 10:55:19 -08:00
Jeffrey Morgan
d454335f4b Merge pull request #189 from kitematic/fix-logs
Don't show jQuery errors and scroll mini logs
2015-02-17 10:28:17 -08:00
Jeffrey Morgan
20e779a147 Don't show jQuery errors and scroll mini logs 2015-02-17 10:26:20 -08:00
Jeffrey Morgan
c858ffa822 Merge pull request #188 from kitematic/fix-reload
Use jQuery to test reload
2015-02-17 10:12:13 -08:00
Jeffrey Morgan
c57ac7e58e Use jQuery to test reload 2015-02-17 10:09:07 -08:00
Mary Anthony
d03ce18b0b Adding in updates for Mac for birthday.
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
2015-02-17 09:58:58 -08:00
Sean Li
56f3416752 Merge pull request #187 from kitematic/sean-polish
Added Back Button to Preferences Page
2015-02-17 09:45:43 -08:00
Jeffrey Morgan
ba6015f5d1 Merge pull request #186 from kitematic/fix-logs-scroll
Fix problem where log overlay scrolls with logs
2015-02-17 09:45:41 -08:00
Sean Li
ba9406bf06 Added back button on preferences. 2015-02-17 09:33:11 -08:00
Jeffrey Morgan
33be5faddc Fix problem where log overlay scrolls with logs 2015-02-17 09:30:26 -08:00
Sean Li
9f782d43a1 Merge branch 'master' into sean-polish 2015-02-17 09:17:35 -08: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
Lei Jitang
57abf4afe9 Fix docker run --expose with an invalid port does not error out
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-02-17 07:12:02 -08:00
Pavel Tikhomirov
cad770f992 integration-cli: check that docker port command output is not empty
Or else we can violate array range boundaries in:
	out = strings.Split(out, ":")[1]
and get runtime error.

We got this runtime error when run TestRunPortFromDockerRangeInUse
Somehow docker goes silently if it cannot publish port because
of no bridge.

Signed-off-by: Pavel Tikhomirov <ptikhomirov@parallels.com>
2015-02-17 16:01:34 +03:00