Alexander Morozov
4ba1128c18
Merge pull request #10871 from ahmetalpbalkan/win-cli/TestBuildAddBadLinks-fix
...
integ-cli: Fix TestBuildAddBadLinks for windows
2015-02-20 17:27:36 -08:00
Michael Crosby
1d382f9c2d
Merge pull request #10865 from ahmetalpbalkan/win-cli/tar-path
...
pkg/archive: Canonicalize stored paths
2015-02-20 17:20:51 -08:00
Alexander Morozov
5919f1b16c
Merge pull request #10844 from ahmetalpbalkan/win-cli/TestBuildDockerfileOutsideContext-path-improvement
...
integration-cli: pass platform-compatible paths to os.Symlink
2015-02-20 17:19:37 -08:00
Ahmet Alp Balkan
d0dc14e5d6
integ-cli: Fix TestBuildAddBadLinks for windows
...
TestBuildAddBadLinks used to build a path by
concenating unix-style forward slashes. Fixed that
by providing a windows-equivalent using `runtime.GOOS`.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-20 13:24:59 -08:00
Jessie Frazelle
f70567e9a9
Merge pull request #10900 from moxiegirl/connection-reset-by-peer-faq
...
Adding info to faq per customer problem.
2015-02-20 13:20:28 -08:00
Jessie Frazelle
aa057fd3b3
Merge pull request #10838 from moxiegirl/mac-update
...
Adding in updates for Mac for upcoming events
2015-02-20 13:10:29 -08:00
Ahmet Alp Balkan
4581240e58
integration-cli: pass platform-compatible paths to os.Symlink
...
Although this doesn't fix the test (os.Symlink is not yet
implemented for Windows), this prevents unix-style paths
from being passed to os.Symlink. Also makes code cleaner
for linux.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-20 12:25:10 -08:00
Tianon Gravi
f2d2862459
Merge pull request #10833 from fabianorosas/10832-fix-test-unit-without-parallel
...
Fix test-unit run without parallel
2015-02-20 12:12:46 -08:00
Alexander Morozov
15bf67a998
Merge pull request #10888 from dougm/parallel-load
...
Avoid parallel layer downloads in load command
2015-02-20 11:01:40 -08:00
Alexander Morozov
4cc8ccb8d2
Merge pull request #10730 from mattyw/fix-10728
...
api/server: don't print warning if serving on localhost
2015-02-20 10:43:56 -08:00
Jessie Frazelle
695bf3348f
Merge pull request #10913 from ahmetalpbalkan/win-cli/UnixSpecific-skip
...
integ-cli: Skip some unix-specific cli tests
2015-02-20 10:33:28 -08:00
Tibor Vass
c5aca86654
Merge pull request #10914 from kargakis/map-commands
...
Map Commands instead of using them as a slice
2015-02-20 10:32:04 -08:00
Fabiano Rosas
ab6ae7215e
Fix export of BUILDFLAGS in test-unit. Closes #10832
...
Signed-off-by: Fabiano Rosas <farosas@br.ibm.com >
2015-02-20 16:25:10 -02:00
Tibor Vass
fdfa7ee702
Merge pull request #10625 from duglin/FixHelpHomeSlash
...
Fix for help when $HOME is /
2015-02-20 10:06:22 -08:00
Michael Crosby
b32564798d
Merge pull request #10665 from brahmaroutu/autogen_removeXflag
...
Removing -X flag option and autogenerating code to create Dockerversion....
2015-02-20 09:53:07 -08:00
Ahmet Alp Balkan
5d615dff10
integ-cli: Typo fix in test_vars_* comments.
...
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com >
2015-02-20 09:51:10 -08:00
Ahmet Alp Balkan
492a58f05f
integ-cli: Skip some unix-specific cli tests
...
Skipping some of the tests closely tied to running in a
unix environment. Windows does not support chmod/chown
and this causes some tests to fail creating desired
behavior.
- `TestBuildWithInaccessibleFilesInContext`: uses chown/chmod
- `TestBuildDockerfileOutsideContext`: uses os.Symlink, not implemented on
windows
- `TestCpUnprivilegedUser`: uses chmod, and requires 'unprivilegeduser'
created by Dockerfile (and thus requires to run inside container)
- `TestBuildChownSingleFile`: uses chown
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-20 09:51:10 -08:00
Alexander Morozov
b1509e8685
Merge pull request #10911 from ahmetalpbalkan/win-cli/TestVolumesNoCopyData-fix
...
integ-cli: fix volume test by passing unix path as volume
2015-02-20 09:21:47 -08:00
Alexander Morozov
b3052b0fca
Merge pull request #10916 from chenhanxiao/commands-comment-typo
...
commands: fix a comment typo
2015-02-20 08:29:21 -08:00
Chen Hanxiao
0050efcd8f
commands: fix a comment typo
...
s/overide/override
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-02-20 23:46:29 +08:00
kargakis
6ecf23861e
Map Commands instead of using them as a slice
...
The most obvious use case is when one wants to make sure as fast
as possible that a command is a valid Dockerfile command.
Signed-off-by: kargakis <kargakis@users.noreply.github.com >
2015-02-20 15:56:21 +01:00
Ahmet Alp Balkan
6062838756
integ-cli: fix volume test by passing unix path as volume
...
This fixes `TestVolumesNoCopyData` for test execution on
windows by passing a unix-style path as volume even though
it's running on windows.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-20 00:58:44 -08:00
Doug Davis
116367eb07
Fix for help when $HOME is /
...
estesp noticed that when $HOME is / the ~ substitutions messes up
becuase it tries to replace all paths that start with "/" with "~".
This fixes it so that it will only replace it when $HOME isn't "/".
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-02-19 22:21:17 -08:00
Srini Brahmaroutu
6871b9b16a
Removing -X flag option and autogenerated code to create Dockerversion.go functionality
...
Addresses #9207
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-02-20 05:40:12 +00:00
mattyw
0ae455333b
api/server: don't print warning if serving on localhost
...
Fixes bug #10728
Signed-off-by: mattyw <gh@mattyw.net >
2015-02-20 12:37:17 +08:00
Alexander Morozov
a78ce5c228
Merge pull request #10872 from jfrazelle/ugh-tomlv
...
fix tomlv because it doesn't read from stdin
2015-02-19 20:31:34 -08:00
Mary Anthony
a61766be9f
Adding in Sven's suggested check the doc line.
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com >
2015-02-19 17:29:46 -08:00
Jessie Frazelle
573e2484a5
Merge pull request #10898 from noironetworks/Fixing-docs-for-docker-ps-filter
...
Added missing documentation for PR #8543
2015-02-19 17:19:09 -08:00
Jessie Frazelle
e22487db37
Merge pull request #10873 from ahmetalpbalkan/win-cli/TestBuildRenamedDockerfile-fix
...
integration-cli: Fix path problems in TestBuildRenamedDockerfile
2015-02-19 16:40:15 -08:00
Jessie Frazelle
1402937347
Merge pull request #10856 from coolljt0725/fix_expose
...
Fix docker run --expose with an invalid port does not error out
2015-02-19 16:01:15 -08:00
Tibor Vass
8507c3d70f
Merge pull request #10904 from jfrazelle/fix-events-test
...
fix race in events test
2015-02-19 15:48:05 -08:00
Doug MacEachern
de35ef2ebe
Avoid parallel layer downloads in load command
...
Signed-off-by: Doug MacEachern <dougm@vmware.com >
2015-02-19 15:46:38 -08:00
Jessica Frazelle
27c61c39db
fix race in events test
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
2015-02-19 15:32:00 -08:00
Lei Jitang
34b7c10e3e
Add a test for expose a invalid port
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-02-19 15:18:13 -08:00
Jessie Frazelle
934535db9c
Merge pull request #10468 from noironetworks/10457-Pause-and-unpause-accept-multi-containers
...
Allow docker pause and unpause to accept multiple containers
2015-02-19 15:16:05 -08:00
Ahmet Alp Balkan
967d85a28f
integ-cli: Fix path problems in TestBuildRenamedDockerfile
...
`TestBuildRenamedDockerfile` tests hard-code unix-style
path building. Made use of `path/filepath` to make these
tests work on Windows as well.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-02-19 14:45:26 -08:00
Jessie Frazelle
55566f2f8f
Merge pull request #10418 from bobrik/overlay-kernel-checks
...
Checking EXT4_FS_SECURITY for overlay
2015-02-19 14:29:17 -08:00
Steve Francia
356fe89d24
Merge pull request #10818 from estesp/link-add-aliases
2015-02-19 17:22:53 -05:00
Steve Francia
a0a27e6a58
Merge pull request #10520 from dmcgowan/v2-registry-fallback-logging
2015-02-19 17:20:34 -05:00
Phil Estes
16aa64dc82
Add linked container's name and hostname as aliases to /etc/hosts
...
Currently when containers are linked the alias name (e.g. from `--link
name:alias`) is added to the parent container's `/etc/hosts` with a
reference to the IP of the linked container. Some software requires
using the official hostname or node name in operations that need to
match on those values, and it is therefore helpful if the parent
container can refer to the child/link using those same values and still
access the same IP.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-02-19 14:19:38 -08:00
Steve Francia
ac7bef5e66
Merge pull request #10852 from Snorch/check-docker-port-is-not-empty
2015-02-19 17:18:36 -05:00
André Martins
401e93bbb9
Added missing documentation for PR #8543
...
Added more examples and functionalities for docker ps documentation
Signed-off-by: André Martins <martins@noironetworks.com >
2015-02-19 22:05:14 +00:00
Jessie Frazelle
7829e7b40f
Merge pull request #10555 from duglin/MoreRenamedDockerfileTests
...
Add more tests around using -f Dockerfile via the CLI
2015-02-19 13:59:35 -08:00
Mary Anthony
a5a0353dbe
Adding info to faq per customer problem.
...
Signed-off-by: Mary Anthony <mary.anthony@docker.com >
2015-02-19 13:42:23 -08:00
Jessica Frazelle
06685a53c1
fix tomlv because it doesn't read from stdin
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
2015-02-19 13:18:20 -08:00
Jessie Frazelle
ff2f1904c9
Merge pull request #10722 from SvenDowideit/takeover-10710
...
added -extfile to server certificate documentation
2015-02-19 13:17:17 -08:00
Steve Francia
d562f94d47
Merge pull request #10797 from tianon/strict-test-environment
2015-02-19 16:14:05 -05:00
Steve Francia
1875cc2ef4
Merge pull request #10835 from jfrazelle/port-ranges
2015-02-19 16:11:59 -05:00
Steve Francia
47f6001416
Merge pull request #10696 from dmcgowan/remove-nonofficial-trust-check
2015-02-19 16:09:52 -05:00
Jessie Frazelle
72e66136ee
Merge pull request #10751 from estesp/10701-update-ipv6-docs
...
Update IPv6 docs with modern `ip` command use + `sysctl`
2015-02-19 12:59:42 -08:00