95d1cd0bde
Merge pull request #8661 from estesp/8555-start-exit-code
...
Return container exit code with start -a/-i
2014-10-21 16:22:15 -07:00
ba5370c116
Fix racy integration tests
...
Do not run containers in the background in the integration tests if you
depend on the run completing. It is better especially if you just want
to ensure that the run has completed with a `true` to just run in
foreground and use a known name for the container to query it after it
has stopped.
The failures can be reproduced on most machines by giving your dind
container one core and a cpushare.
docker run -c 200 --cpuset 0 -ti --rm --privileged -e
DOCKER_GRAPHDRIVER=vfs docker hack/make.sh binary test-integration-cli
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-21 22:51:09 +00:00
a34831f016
builder: handle cases where onbuild is not uppercase.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-21 20:17:37 +00:00
cf44d6f9cc
Merge pull request #8665 from cpuguy83/8659_clean_paths_for_volumes
...
Clean volume paths
2014-10-21 11:17:03 -04:00
a10876d355
Merge pull request #8573 from estesp/integration-test-migrate
...
Migrate container GET API tests from integration to integration-cli
2014-10-20 18:06:40 -07:00
ef98fe0763
Make container.Copy support volumes
...
Fixes #1992
Right now when you `docker cp` a path which is in a volume, the cp
itself works, however you end up getting files that are in the
container's fs rather than the files in the volume (which is not in the
container's fs).
This makes it so when you `docker cp` a path that is in a volume it
follows the volume to the real path on the host.
archive.go has been modified so that when you do `docker cp mydata:/foo
.`, and /foo is the volume, the outputed folder is called "foo" instead
of the volume ID (because we are telling it to tar up
`/var/lib/docker/vfs/dir/<some id>` and not "foo", but the user would be
expecting "foo", not the ID
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-10-20 20:23:01 -04:00
964f9965c7
Clean volume paths
...
Fixes #8659
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-10-20 19:07:56 -04:00
af52f8edcf
Merge pull request #8638 from LK4D4/fix_8632
...
Don't write pull output to stdout on container creating
2014-10-20 18:10:47 -04:00
52784c09b7
Merge pull request #8543 from brahmaroutu/filter_containers_7599
...
Adding capability to filter by name, id or status to list containers api
2014-10-20 15:04:24 -07:00
b90ab68f2a
Merge pull request #8511 from coolljt0725/fix_tag
...
Fix tag an existed tag name of a repository
2014-10-20 14:32:23 -07:00
1634625353
Adding capability to filter by name, id or status to list containers api
...
Closes #7599
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2014-10-20 18:33:20 +00:00
c496f24157
Add docker tag tests.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2014-10-20 11:10:31 +08:00
65edb07065
Return container exit code with start -a/-i
...
Addresses #8555
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2014-10-18 23:00:20 -04:00
c980fe09b7
Add a testcase to make sure we don't squash tabs or convert them to spaces
...
This is in response to @SvenDowideit asking if we had a "tab" testcase
in https://github.com/docker/docker/issues/2315#issuecomment-58133508
I couldn't find one so I'm adding one
Closes #2315
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-10-17 15:52:48 -07:00
75fd1b614d
Merge pull request #8639 from erikh/fix_escapes
...
builder: fix escaping for ENV variables.
2014-10-17 15:50:37 -07:00
df0e0c7683
builder: fix escaping for ENV variables.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-17 21:47:35 +00:00
3c325f89e5
Merge pull request #8415 from LK4D4/use_logs_in_builder
...
Use logs instead of attach for builder
2014-10-17 13:32:13 -07:00
6f09d064bd
Use logs instead of attach for builder
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 13:20:02 -07:00
93d3c8e71d
Just remove integration-cli/build_tests/TestCopy/MultipleFilesToFile because it wasn't used
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:58:12 -07:00
98e7608b4c
Rewrite TestBuildCopyDisallowRemote to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:58:12 -07:00
c8a5d56fd7
Rewrite TestBuildCopyEtcToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:57:48 -07:00
6582ea574c
Rewrite TestBuildCopyWholeDirToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:57:30 -07:00
4a029259ff
Rewrite TestBuildCopyDirContentToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:57:07 -07:00
832618afc6
Rewrite TestBuildCopyDirContentToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:56:49 -07:00
24d83afd52
Rewrite TestBuildCopySingleFileToNonExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:56:28 -07:00
2248109ff8
Rewrite TestBuildCopySingleFileToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:56:01 -07:00
d41cba6aed
Rewrite TestBuildCopySingleFileToWorkdir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:55:34 -07:00
83c5dced10
Rewrite TestBuildCopySingleFileToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:55:04 -07:00
e45c92153d
Rewrite TestBuildCopyAddMultipleFiles to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:54:29 -07:00
5a20dc67b0
Merge pull request #8567 from LK4D4/add_log_done
...
Add logDone for TestBuildAddSingleFileToNonExistDir
2014-10-17 11:20:12 -07:00
09ceae5c9c
Merge pull request #8486 from duglin/Issue5701
...
Add failing testcase for single quotes in CMD
2014-10-17 11:11:49 -07:00
ad136e1ae3
Don't write pull output to stdout on container creating
...
Fixes #8632
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-17 11:08:53 -07:00
5af7facf18
Cleanup errorOut remove errorOut functions
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
66ac7420a9
Cleanup errorOut resp run tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
842d4b6b0a
Cleanup errorOut resp log tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
9f52d8e6e7
Cleanup errorOut resp restart tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
6f1c8ff4c4
Cleanup errorOut resp exec tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
eeb0097294
Cleanup errorOut resp pull tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
dd248dee3c
Cleanup errorOut resp in images tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
50c3e7537c
Cleanup errorOut resp in version tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
f013506aad
Cleanup errorOut resp in push tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
764030ec92
Cleanup errorOut resp in top tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
b1e3c9e9cd
Cleanup errorOut resp in build tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
0c87424007
Cleanup errorOut resp in save tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
0e3744ec89
Cleanup errorOut resp in rmi tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:20 -07:00
ac24cabd9d
Cleanup errorOut resp in inspect tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:19 -07:00
d33f2bdb11
Cleanup errorOut resp in ps tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:19 -07:00
ef787eb824
Cleanup errorOut resp in search tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:19 -07:00
73eadbc6a1
Cleanup errorOut resp in docker_utils.go
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:06:16 -07:00
ac62c5439a
Cleanup errorOut resp in diff test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
7d38ae7041
Cleanup errorOut resp in links test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
f7b3a6b292
Cleanup errorOut resp in history test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
b59d5a9dd2
Cleanup errorOut resp in info test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
0faf87598f
Cleanup errorOut resp in kill test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
17842840ec
Cleanup errorOut resp in nat test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
6b858b59ed
Cleanup errorOut resp in create test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
475235ba7e
Cleanup errorOut resp in tag test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
b645df1d39
Cleanup errorOut resp in export test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
88d65cbdf4
Cleanup errorOut resp in port test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
3182ee5c9b
Cleanup errorOut resp in commit test
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Cleanup errorOut resp in commit test
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-16 15:05:00 -07:00
9edf967824
Add failing testcase for single quotes in CMD
...
Closes #5701
This is due to @SvenDowideit comment at: https://github.com/docker/docker/issues/5701#issuecomment-58133541
where he asked for a testcase showing the error case.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-10-16 14:40:55 -07:00
d8cd8165a9
Migrate container GET API tests from integration to integration-cli
...
An initial start to migration of the API tests from integration to
the integration-cli model.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
(github: estesp)
2014-10-16 17:34:28 -04:00
b3cda9fc7e
Merge pull request #8566 from jfrazelle/Cleanup-fmt-%q
...
Cleanup: integration-cli ('%s' with %q)
2014-10-16 13:51:46 -07:00
3893e220e8
Setting iptables=false should propagate to ip-masq=false
...
Signed-off-by: Jessica Frazelle <jess@docker.com>
2014-10-16 11:52:14 -07:00
fcfe80f633
Minor fix of tests names
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-14 11:47:01 -07:00
fbaa41b5aa
Add logDone for TestBuildAddSingleFileToNonExistDir
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-14 11:17:41 -07:00
949ab47710
Replace '%s' in test utils
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:38 -07:00
c091397d51
Replace '%s' in run tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:19 -07:00
be31a66b7a
Replace '%s' in rm tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:11 -07:00
a44296603f
Replace '%s' in diff tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:59:01 -07:00
91f33fcaaa
Replace '%s' in create tests
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-14 10:58:35 -07:00
24189b2c36
Fix builder from being over-aggressive on ${}
...
`${SOME_VAR%pattern}` was turning into `SOME_VAL%pattern}` which the shell would then balk at.
I've updated the `TOKEN_ENV_INTERPOLATION` regex to account for this (ie, if `${` is used, it _must_ also match the closing `}`), and renamed the variable to not be exported (since it's not used outside the function following it).
I also added comments for the bits of `tokenEnvInterpolation` so they're easier to follow. 😄
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-10-14 00:58:55 -06:00
1150c1639a
builder: ONBUILD triggers were not accurately being executed in JSON cases.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-14 01:59:45 +00:00
72d8d94284
Merge pull request #8497 from aluzzardi/disable-stable-ip
...
Disable stable IPs.
2014-10-09 15:54:33 -07:00
5b8379a434
Disable stable IPs.
...
Stable IPs causes some regressions in the way people use Docker, see GH#8493.
Reverting it for 1.3, we'll enable it back for the next release.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-10-09 15:15:17 -07:00
b66ac6a809
Revert "Fix line delimited JSON response"
...
This reverts commit d2f75a3040
2014-10-09 13:46:21 -07:00
4eb812e042
Merge pull request #8457 from jfrazelle/pr_8455
...
Check /etc/resolv.conf every time for 127.* content
2014-10-08 16:21:14 -07:00
dbe6c6651e
cleanup resolve.conf code
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-08 15:15:51 -07:00
0486bd022e
Merge pull request #8450 from dqminh/fix-proxy-exit
...
dont close proxy's stdout/stderr prematurely
2014-10-08 14:20:33 -07:00
d7bcc099be
Merge pull request #8475 from cpuguy83/fix_create_phantom_volumes_on_container_restart
...
Fixes re-creating volume on (re)start
2014-10-08 13:58:56 -07:00
c985302c5c
Fixes re-creating volume on (re)start
...
When a container is restarted all the volume configs are parsed again.
Even if the volume was already handled in a previous start it was still
calling "FindOrCreateVolume" on the volume repo causing a new volume to
be created.
This wasn't being detected because as part of the mount initialization
it checks to see if the the _mount_ was already initialized, but this
happens after the parsing of the configs.
So a check is added during parsing to skip a volume which was already
created for that container.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-10-08 16:25:51 -04:00
9acf7c765c
Restore volume refs after daemon restart
...
Volume refs were not being restored on daemon restart.
This made it possible to remove a volume being used by other containers
after a daemon restart.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-10-08 14:17:27 -04:00
3b9d88210e
pass extra file to child process as status handler
...
When stdout/stderr is closed prematurely, the proxy's writes to stdout/stderr
(i.e. `log.Errorf/log.Printf`) will returns with EPIPE error, and go runtime
will terminate the proxy when stdout/stderr writes trigger 10 EPIPE errors.
instead of using stdout/stderr as the status handler, we pass an extra file to
the child process and write `0\n` or `1\nerror message` to it and close it
after. This allow the child process to handle stdout/stderr as normal.
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-10-08 12:53:43 -04:00
de32f48e66
Fix Tag Test for longer tags
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-07 19:37:08 -07:00
acd511786e
Test for check /etc/resolv.conf on every docker run for 127.* content.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-07 16:51:51 -07:00
50fa9dffcf
Allow child to overwrite entrypoint from parent
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-10-07 23:45:35 +00:00
12203e475d
Merge pull request #8434 from tiborvass/ignore_invalid_Dockerfile_instructions
...
Ignore unknown dockerfile instructions
2014-10-07 14:45:51 -07:00
40cad37f0a
Merge pull request #8341 from unclejack/add_workdir_test
...
add test for workdir env vars and add docs
2014-10-07 14:27:32 +10:00
9fe1dd3103
Add test for ignoring invalid dockerfile instructions
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-10-06 23:14:25 -04:00
a650ab7f29
Merge pull request #8409 from unclejack/integcli_lint
...
integcli: lint fixes
2014-10-06 14:32:08 -07:00
c0e632246d
integcli: lint fixes
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-10-06 23:15:17 +03:00
6157af8292
Merge pull request #8416 from LK4D4/fix_build_cache_test
...
Fix TestBuildCacheADD to check cache in out, not in id
2014-10-06 11:56:18 -07:00
128c52f583
Merge pull request #8417 from cpuguy83/8398_fix_automatic_data_copy_for_volumesfrom
...
volumes copying data unexpectedly
2014-10-06 11:43:41 -07:00
40070609da
Merge pull request #8369 from vieux/add_test_rm
...
add test and move one from rm to rmi
2014-10-06 11:30:12 -07:00
e95b6fb648
Fix #8398 - volumes copying data unexpectedly
...
Prior to the volumes re-factor, data was not being copied on
volumes-from or host-mounted volumes.
After the re-factor, data was being copied for volumes-from.
This reverts this unintentional change in behavior.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2014-10-06 14:21:46 -04:00
3e473c08b4
update test
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-10-06 18:18:25 +00:00
21dff8cbec
Fix TestBuildCacheADD to check cache in out, not in id
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-10-06 10:04:10 -07:00
115436e038
docker save: Do not save to a terminal.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-10-06 09:50:40 -07:00
84d9fd37b0
Merge pull request #8392 from jfrazelle/pr_8389
...
Invalid mount mode for volumes in
2014-10-03 17:22:21 -07:00
b10b458b6e
Add test for invalid mount mode for volumes in.
...
Closes #8389 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-10-03 16:17:51 -07:00
Michael Crosby
Michael Crosby
Erik Hollensbe
Tibor Vass
Victor Vieux
Brian Goff
Alexandr Morozov
Srini Brahmaroutu
Lei Jitang
Phil Estes
Doug Davis
Jessie Frazelle
Alexandr Morozov
Jessica Frazelle
Tianon Gravi
Andrea Luzzardi
Daniel, Dao Quang Minh
Sven Dowideit
unclejack
Brian Goff
Victor Vieux