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
007b4f6340
Fixes bad validMountMode check
...
Needed to check if the mode was invalid and return error, not valid and
return error.
This didn't get picked up because the existing integration-cli tests
were all either expecting errors when a valid mode was passed in (e.g.
"ro" passed in, we expected an error because it was testing write). So
modified a test which was testing for "rw" to actually pass in "rw"
instead of assuming the "rw"
Docker-DCO-1.1-Signed-off-by: Brian Goff <bgoff@cpuguy83-mbp.home> (github: cpuguy83)
2014-10-03 16:55:39 -04:00
b669025949
Stable MAC addresses: Add support for MAC address restoring.
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-10-03 13:46:24 -07:00
a487593729
Stable Networking: Keep the same network settings across container restarts.
...
This change will allocate network settings (IP and public ports) at
container creation rather than start and keep them throughout the
lifetime of the container (i.e. until it gets destroyed) instead of
discarding them when the container is stopped.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
2014-10-03 13:46:24 -07:00
c68e6b15a5
add test and move one from rm to rmi
...
Signed-off-by: Victor Vieux <vieux@docker.com>
2014-10-02 23:39:39 +00:00
4424d15f99
Merge pull request #8302 from rafecolton/move_archive_package_to_pkg
...
Move archive package to pkg
2014-10-01 18:03:34 +03:00
2c5b5cfc92
Add ENV variables support to WORKDIR build command
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Conflicts:
builder/builder.go
This file has been deleted.
2014-10-01 17:34:36 +03:00
30d5a42c1f
Move archive package into pkg/archive
...
Now that the archive package does not depend on any docker-specific
packages, only those in pkg and vendor, it can be safely moved into pkg.
Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
2014-09-29 23:23:36 -07:00
ea09f03682
Filter containers by status.
...
A continuation of #7616 .
Adds `docker ps --filter=status=(restarting|running|paused|stopped)` option.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-29 20:11:19 -07:00
7c1aee6291
Merge pull request #8289 from duglin/FixTestcaseFor8230
...
Fixes the new testcase for PR #8230
2014-09-29 15:33:51 -07:00
8b3fbac15c
Fixes the new testcase for PR #8230
...
This new version makes sure that the same context is used for the two
builds run in the test. If you don't use the same build then about 1/2 the
time the file copied into the container will look like a different file,
probably due to timestamp differences. But reusing the same context we
re-use the same file on disk and therefore avoid the change in timestamps,
and we use the cache on the 2nd build.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-29 13:35:09 -07:00
670c8696a2
Merge pull request #8284 from erikh/fix_cmd_again
...
builder: Fix CMD to inject /bin/sh -c when provided with a non-json value
2014-09-29 15:56:16 -04:00
9f142bf9be
builder: Fix CMD to inject /bin/sh -c when provided with a non-json value.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-29 12:22:18 -07:00
1cd6135972
Merge pull request #8230 from duglin/Issue6820
...
add wildcard support to COPY/ADD (part 2 of issue #6820 )
2014-09-29 11:19:01 -07:00
8833d800bf
check tag's validity before building.
...
When user passes an invalid tag to `docker build`
(i.e. `docker build -t abcd:A0123456789B0123456789C0123456789 .`), check the
tag first and terminate-early so user can specify the tag again
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-09-29 06:21:54 -04:00
882223c0f8
Fix #8259 - Can't reuse symlink'd bindmount
...
volumes.Get was not checking for symlinked paths meanwhile when adding a
new volume it was following the symlink.
So when trying to use a bind-mount that is a symlink, the volume is
added with the correct path, but when another container tries to use the
same volume it got a "Volume exists" error because volumes.Get returned
nil and as such attempted to create a new volume.
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-09-26 14:36:44 -04:00
0bb5f98731
Merge pull request #8233 from tiborvass/pr-7658
...
Fix Interactive container hangs when redirecting stdout
2014-09-26 11:31:29 -07:00
07da2e03b1
Merge pull request #8224 from cpuguy83/7843_fix_start_attach_error_hang
...
Fix #7843 start -a can cause frozen term
2014-09-26 11:54:39 -04:00
9ae9d7db57
Fix #7843
...
When doing `docker start -a` on a container that won't start, terminal
was getting stuck on the attach, even after container removal.
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-09-26 11:31:02 -04:00
acd40d5079
add wildcard support to copy/add
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-25 20:44:51 -07:00
1379c6ec50
Merge pull request #8193 from jfrazelle/8141-pull-all-image-aliases-for-id
...
Pull all image aliases for id
2014-09-25 15:22:46 -04:00
29a62ceefc
Add DockerCli tests
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-25 20:58:43 +02:00
7d74be162c
Pull all image aliases for id. Closes #8141 .
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-25 11:48:49 -07:00
857b739e29
Merge pull request #8208 from estesp/7851-fix-hostname-fqdn
...
Provide full hostname with domainname to underlying container layer
2014-09-25 11:33:50 -07:00
d369612b41
Merge pull request #7994 from erikh/parser_fix_volume_parsing
...
builder: Fix handling of VOLUME command where multiple volumes are specified in a space delimited list.
2014-09-25 12:45:48 -04:00
a5ca549a18
builder: Fix handling of VOLUME command where multiple volumes are
...
specified in a space delimited list.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-25 09:44:19 -07:00
5239ba3d06
Provide full hostname with domainname to underlying container layer
...
Addresses #7851
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-09-25 09:23:39 -04:00
a936842208
Merge pull request #8207 from LK4D4/rewrite_more_fixtures_test
...
Rewrite more fixtures test to not use fixtures.
2014-09-24 15:07:03 -07:00
f2fad5c290
Merge pull request #8173 from crosbymichael/update-mem-limit
...
Update memory limit for container
2014-09-24 20:55:25 +03:00
d302d92961
Rewrite TestContextTar tests to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 17:09:18 +04:00
51a56399f6
Rewrite TestBuildWithInaccessibleFilesInContext to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 17:09:14 +04:00
52cf331206
Rewrite TestBuildRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 13:15:55 +04:00
ab4738b49f
Rewrite TestBuildHistory to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 12:38:48 +04:00
1625cbfc4c
Rewrite TestBuildForceRm to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-24 12:29:27 +04:00
827634d355
Merge pull request #7973 from LK4D4/persist_execdriver_dir
...
Persist execdriver dir
2014-09-23 16:01:03 -07:00
81a643211b
Merge pull request #8186 from duglin/ErrInCopyCache
...
Make sure COPY/ADD on dirs doesn't grab too many files
2014-09-23 15:16:57 -07:00
cd329d062b
Make sure COPY/ADD on dirs doesn't grab too many files
...
Add check for / first - per LK4D4's comment.
Add a comment to explain why we're adding a /
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-23 14:16:00 -07:00
8edacc673a
builder: properly communicate onbuild trigger information during
...
subsequent builds.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-23 13:55:51 -07:00
5ce7ee61ef
Merge pull request #8179 from erikh/parser_fix_cmd_null
...
Parser fix cmd null
2014-09-23 13:42:55 -04:00
0c899cefdd
Rewrite TestBuildAddWholeDirToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 18:58:32 +04:00
570f1153b9
Rewrite TestBuildAddEtcToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 18:58:28 +04:00
c58391bbd0
Rewrite TestBuildAddDirContentToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
2d802d7f23
Rewrite TestBuildAddDirContentToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
139b6ed3aa
Rewrite TestAddSingleFileToNonExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
6bb44b6d74
Rewrite TestAddSingleFileToExistDir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
5e2ea69606
Rewrite TestAddSingleFileToWorkdir to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:58 +04:00
682fbe0134
Rewrite TestAddSingleFileToRoot to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:09 +04:00
3824ec62e8
Rewrite TestBuildSixtySteps to not use fixtures
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-23 15:15:09 +04:00
d1613e1d59
builder: integration-cli test for the previous commit.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-22 23:18:46 -07:00
9b755412ab
Update memory limit for container
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2014-09-22 21:41:14 +00:00
652cd6a842
Test on execdriver dir behavior
...
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
2014-09-22 22:49:21 +04:00
c6965e3e45
integcli: add & use dockerCmdWithTimeout & InDir
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 21:02:51 +03:00
5d1cb9d005
integcli: add util to fetch container status
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 20:34:57 +03:00
97b50e0f29
integcli: consolidate cmd exit code processing
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 20:32:50 +03:00
77d29847e2
integcli: pull scratch for pull test
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 19:03:19 +03:00
c69896d8a0
integcli: fix race in runCommandWithStdoutStderr
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-22 17:53:12 +03:00
5ad82d3ea6
Merge pull request #8137 from jfrazelle/8135-event-log-die-start-fail
...
After container fails to start, log the event die.
2014-09-22 12:47:04 +04:00
d64d55eca8
After container fails to start, log the event die.
...
Fixes #8135 .
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-19 16:06:49 -07:00
45407cf00a
Split volumes out from daemon
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-09-19 17:47:47 -05:00
63c8b8bf30
Merge pull request #8131 from unclejack/fix_perm_detection
...
integcli: fix permission detection for aufs
2014-09-19 11:55:56 -07:00
2e2422b0eb
Use prefix naming for rmi tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
cc54b77fce
Use prefix naming for rm tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
1ddd013b19
Use prefix naming for restart tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
00b82fcab6
Use prefix naming for ps tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
6e8c9e7bee
Use prefix naming for port tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
b6325907e9
Use prefix naming for links tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
27a27b7388
Use prefix naming for create tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:54 +04:00
66cd3640f1
Use prefix naming for build tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 22:11:50 +04:00
1a0347ff1d
integcli: fix permission detection for aufs
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-19 21:08:57 +03:00
f312f784e1
Use prefix naming for attach tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 21:56:25 +04:00
3812a6a846
Use prefix naming for inspect tests
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 21:56:25 +04:00
9720078f9e
Use prefix naming for events test
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 21:56:25 +04:00
aa536b27a7
Use prefix naming for docker_cli_run_test.go
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-19 21:56:24 +04:00
05b8a1eb36
Add support for copy/add with multiple src files
...
Part one of solution for issue #6820
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-18 20:12:13 -07:00
42dafe4bd8
test for panic on daemon restart
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-18 21:54:42 +00:00
184fe67bbc
Add Build prefix to Copy tests
...
Now we can do "-run TestBuild" to test all build-tests and "-run
TestBuildCopy" for test all copy-tests
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-18 09:09:10 +04:00
aa0449c813
Fix logDone message for TestCopySingleFileToExistDir
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-18 09:02:05 +04:00
77d30e7112
Merge pull request #8041 from unclejack/lower_allocations_broadcastwriter
...
lower the number of allocations in broadcastwriter
2014-09-17 15:26:44 -07:00
c171cf0cc3
Merge pull request #8088 from unclejack/integcli-keep_permissions
...
integcli: run inaccessible context test in tmpdir
2014-09-17 22:06:26 +04:00
be924087eb
integcli: run build tests in tmpdir
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 20:05:33 +03:00
9ae3134dc9
add the timeutils package
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 14:30:08 +03:00
f98a1f1f7d
Merge pull request #8019 from thockin/add-host
...
Allow extra lines in /etc/hosts
2014-09-16 17:19:16 -07:00
68e48b65a6
Allow extra lines in /etc/hosts
...
This adds a --add-host host:ip flag which appends lines to /etc/hosts. This is needed in places where you want the container to get a different name resolution than it would through DNS. This was submitted before as #5525 , closed, and now I am re-opening. It has come up 2 or 3 times in the last couple days.
Signed-off-by: Tim Hockin <thockin@google.com>
2014-09-16 23:38:23 +00:00
ca39a3e36b
Merge pull request #7110 from tiborvass/merge-6907
...
Docker create (rebase of 6907)
2014-09-17 03:23:50 +04:00
b0cb37fd3b
integration-cli: Add docker create tests
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-09-16 18:40:24 -04:00
0a3211f131
Fix #7792 - Order mounts
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-09-16 14:51:06 -07:00
51b26853ef
Merge pull request #7976 from duglin/Issue7902
...
Fix for issue 7902 - add trailing zeros to timestamps so logs align
2014-09-16 13:55:03 -07:00
00fd008170
Merge pull request #8062 from vishh/run_in_phase2
...
Add support for 'docker exec' - phase 2
2014-09-16 23:56:12 +04:00
f88e2e8b99
Merge pull request #8054 from estesp/6830-fix-json-strings
...
Proper JSON handling of strings that could be represented as other types
2014-09-16 15:11:25 -04:00
1b0b1ec657
Proper JSON handling of strings that could be represented as other types
...
Addresses #6830
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-09-16 13:51:02 -04:00
cd7a5f5c09
Fix for issue 7902.
...
Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-16 10:28:37 -07:00
9e5592d6a1
integ-cli: fix TestImportDisplay & add FileServer
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-16 01:54:21 +03:00
985fae256f
Update integration-cli tests to allow one-letter tag as valid.
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-15 15:17:50 -07:00
fbae71326c
Merge pull request #8020 from erikh/rewrite_hosts_files
...
Links v2: Mutable network files
2014-09-15 23:03:30 +04:00
d980589de6
Adding integration tests for docker exec feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-15 16:59:59 +00:00
31c0039022
clean up the context when a build fails
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-15 16:01:23 +03:00
Jessica Frazelle
Doug Davis
Phil Estes
Michael Crosby
Alexandr Morozov
Tianon Gravi
Erik Hollensbe
Victor Vieux
Andrea Luzzardi
Brian Goff
Daniel, Dao Quang Minh
Michael Crosby
Jessie Frazelle
Sven Dowideit
Tibor Vass
Alexandr Morozov
unclejack
Brian Goff
Victor Vieux
unclejack
Adrien Folie
Rafe Colton
Tim Hockin
Alexander Larsson
Vishnu Kannan