docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,948 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

743 Commits

Author SHA1 Message Date
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Doug Davis 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
Phil Estes 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
Michael Crosby b3cda9fc7e Merge pull request #8566 from jfrazelle/Cleanup-fmt-%q 
Cleanup: integration-cli ('%s' with %q)
 2014-10-16 13:51:46 -07:00
Jessica Frazelle 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
Alexandr Morozov fcfe80f633 Minor fix of tests names 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-14 11:47:01 -07:00
Alexandr Morozov fbaa41b5aa Add logDone for TestBuildAddSingleFileToNonExistDir 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-10-14 11:17:41 -07:00
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Jessica Frazelle 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
Tianon Gravi 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
Erik Hollensbe 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
Victor Vieux 72d8d94284 Merge pull request #8497 from aluzzardi/disable-stable-ip 
Disable stable IPs.
 2014-10-09 15:54:33 -07:00
Andrea Luzzardi 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
Jessica Frazelle b66ac6a809 Revert "Fix line delimited JSON response" 
This reverts commit d2f75a3040.

Conflicts:
	integration-cli/docker_api_events_test.go

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-10-09 13:46:21 -07:00
Michael Crosby 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
Jessica Frazelle 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
Michael Crosby 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
Andrea Luzzardi 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
Brian Goff 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
Brian Goff 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
Daniel, Dao Quang Minh 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
Jessica Frazelle 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
Jessica Frazelle 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
Michael Crosby 50fa9dffcf Allow child to overwrite entrypoint from parent 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-10-07 23:45:35 +00:00
Jessie Frazelle 12203e475d Merge pull request #8434 from tiborvass/ignore_invalid_Dockerfile_instructions 
Ignore unknown dockerfile instructions
 2014-10-07 14:45:51 -07:00
Sven Dowideit 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
Tibor Vass 9fe1dd3103 Add test for ignoring invalid dockerfile instructions 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-10-06 23:14:25 -04:00
Alexandr Morozov a650ab7f29 Merge pull request #8409 from unclejack/integcli_lint 
integcli: lint fixes
 2014-10-06 14:32:08 -07:00
unclejack 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
Victor Vieux 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
Michael Crosby 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
Victor Vieux 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
Brian Goff 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
Victor Vieux 3e473c08b4 update test 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-10-06 18:18:25 +00:00
Alexandr Morozov 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
Erik Hollensbe 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
Andrea Luzzardi 84d9fd37b0 Merge pull request #8392 from jfrazelle/pr_8389 
Invalid mount mode for volumes in
 2014-10-03 17:22:21 -07:00
Jessica Frazelle 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
Brian Goff 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
Andrea Luzzardi 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
Andrea Luzzardi 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
Victor Vieux 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
unclejack 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
Adrien Folie 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
Rafe Colton 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
Jessica Frazelle 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
Victor Vieux 7c1aee6291 Merge pull request #8289 from duglin/FixTestcaseFor8230 
Fixes the new testcase for PR #8230
 2014-09-29 15:33:51 -07:00
Doug Davis 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
Tibor Vass 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
Erik Hollensbe 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
Erik Hollensbe 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
Daniel, Dao Quang Minh 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
Brian Goff 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
Michael Crosby 0bb5f98731 Merge pull request #8233 from tiborvass/pr-7658 
Fix Interactive container hangs when redirecting stdout
 2014-09-26 11:31:29 -07:00
Tibor Vass 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
Brian Goff 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
Doug Davis acd40d5079 add wildcard support to copy/add 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2014-09-25 20:44:51 -07:00
Tibor Vass 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
Tibor Vass 29a62ceefc Add DockerCli tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-09-25 20:58:43 +02:00
Jessica Frazelle 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
Victor Vieux 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
Tibor Vass 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
Erik Hollensbe 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
Phil Estes 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
Victor Vieux 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
unclejack f2fad5c290 Merge pull request #8173 from crosbymichael/update-mem-limit 
Update memory limit for container
 2014-09-24 20:55:25 +03:00
Alexandr Morozov d302d92961 Rewrite TestContextTar tests to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 17:09:18 +04:00
Alexandr Morozov 51a56399f6 Rewrite TestBuildWithInaccessibleFilesInContext to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 17:09:14 +04:00
Alexandr Morozov 52cf331206 Rewrite TestBuildRm to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 13:15:55 +04:00
Alexandr Morozov ab4738b49f Rewrite TestBuildHistory to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 12:38:48 +04:00
Alexandr Morozov 1625cbfc4c Rewrite TestBuildForceRm to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-24 12:29:27 +04:00
Victor Vieux 827634d355 Merge pull request #7973 from LK4D4/persist_execdriver_dir 
Persist execdriver dir
 2014-09-23 16:01:03 -07:00
Victor Vieux 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
Doug Davis 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
Erik Hollensbe 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
Tibor Vass 5ce7ee61ef Merge pull request #8179 from erikh/parser_fix_cmd_null 
Parser fix cmd null
 2014-09-23 13:42:55 -04:00
Alexandr Morozov 0c899cefdd Rewrite TestBuildAddWholeDirToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 18:58:32 +04:00
Alexandr Morozov 570f1153b9 Rewrite TestBuildAddEtcToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 18:58:28 +04:00
Alexandr Morozov c58391bbd0 Rewrite TestBuildAddDirContentToExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:58 +04:00
Alexandr Morozov 2d802d7f23 Rewrite TestBuildAddDirContentToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:58 +04:00
Alexandr Morozov 139b6ed3aa Rewrite TestAddSingleFileToNonExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:58 +04:00
Alexandr Morozov 6bb44b6d74 Rewrite TestAddSingleFileToExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:58 +04:00
Alexandr Morozov 5e2ea69606 Rewrite TestAddSingleFileToWorkdir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:58 +04:00
Alexandr Morozov 682fbe0134 Rewrite TestAddSingleFileToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:09 +04:00
Alexandr Morozov 3824ec62e8 Rewrite TestBuildSixtySteps to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-23 15:15:09 +04:00
Erik Hollensbe 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
Michael Crosby 9b755412ab Update memory limit for container 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-22 21:41:14 +00:00
Alexandr Morozov 652cd6a842 Test on execdriver dir behavior 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-22 22:49:21 +04:00
unclejack 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
unclejack 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
unclejack 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
unclejack 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
unclejack 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
Alexandr Morozov 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
Jessica Frazelle 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
Brian Goff 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
Michael Crosby 63c8b8bf30 Merge pull request #8131 from unclejack/fix_perm_detection 
integcli: fix permission detection for aufs
 2014-09-19 11:55:56 -07:00
Alexandr Morozov 2e2422b0eb Use prefix naming for rmi tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 22:11:54 +04:00
Alexandr Morozov cc54b77fce Use prefix naming for rm tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 22:11:54 +04:00
Alexandr Morozov 1ddd013b19 Use prefix naming for restart tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 22:11:54 +04:00
Alexandr Morozov 00b82fcab6 Use prefix naming for ps tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 22:11:54 +04:00
Alexandr Morozov 6e8c9e7bee Use prefix naming for port tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 22:11:54 +04:00
Alexandr Morozov b6325907e9 Use prefix naming for links tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 22:11:54 +04:00
Alexandr Morozov 27a27b7388 Use prefix naming for create tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 22:11:54 +04:00
Alexandr Morozov 66cd3640f1 Use prefix naming for build tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 22:11:50 +04:00
unclejack 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
Alexandr Morozov f312f784e1 Use prefix naming for attach tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 21:56:25 +04:00
Alexandr Morozov 3812a6a846 Use prefix naming for inspect tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 21:56:25 +04:00
Alexandr Morozov 9720078f9e Use prefix naming for events test 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-19 21:56:25 +04:00
Alexandr Morozov 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
Doug Davis 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
Jessica Frazelle 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
Alexandr Morozov 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
Alexandr Morozov aa0449c813 Fix logDone message for TestCopySingleFileToExistDir 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
 2014-09-18 09:02:05 +04:00
Michael Crosby 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
Alexandr Morozov 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
unclejack 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
unclejack 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
Jessie Frazelle f98a1f1f7d Merge pull request #8019 from thockin/add-host 
Allow extra lines in /etc/hosts
 2014-09-16 17:19:16 -07:00
Tim Hockin 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
Alexandr Morozov ca39a3e36b Merge pull request #7110 from tiborvass/merge-6907 
Docker create (rebase of 6907)
 2014-09-17 03:23:50 +04:00
Alexander Larsson 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
Brian Goff 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
Jessie Frazelle 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
Alexandr Morozov 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
Tibor Vass 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
Phil Estes 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
Doug Davis 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
unclejack 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
Jessica Frazelle 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
Alexandr Morozov fbae71326c Merge pull request #8020 from erikh/rewrite_hosts_files 
Links v2: Mutable network files
 2014-09-15 23:03:30 +04:00
Vishnu Kannan 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
unclejack 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
unclejack c751e1739d Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999 
Fix ps -s hang
 2014-09-15 13:54:29 +03:00
Erik Hollensbe 09b700288e Allow /etc/hosts and /etc/resolv.conf to be updated both outside and 
inside the container.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-13 11:27:34 -07:00
Michael Crosby a96811272a Merge pull request #7934 from LK4D4/fix_double_allocation 
Fix error propagation from userland-proxy
 2014-09-12 11:39:10 -07:00
unclejack 3ec564bfda integ-cli: better debug output for run & import 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-12 16:51:21 +03:00
Alexandr Morozov 41cbce8c00 Test for docker ps -s 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-12 11:45:50 +04:00
Alexandr Morozov 41e9e93e27 Fix my own comments from #7927 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-12 10:05:07 +04:00
Tibor Vass 3109fc9537 Add Test for port allocation bug (port already in use by other programs than docker) 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-09-12 09:51:14 +04:00
Michael Crosby 32b5d145fa Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag 
Failing to remove an image, will not remove the image name/tag.
 2014-09-11 18:06:18 -07:00
Michael Crosby 98e409172c Merge pull request #7996 from estesp/7943-validate-tagnames 
Validate tag names similar to repository name validation; add tests
 2014-09-11 15:19:50 -07:00
Phil Estes 46eb4140c9 Validate tag names similar to repository name validation; add tests 
Addresses #7943

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2014-09-11 17:52:36 -04:00
Jessica Frazelle b2efdc538d Removing an image that fails, also removes the image name/tag. 
Fixes #7845 and #7801, and a real pain point I had :)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2014-09-11 11:29:25 -07:00
Erik Hollensbe 576416c99a move entrypoint integration-cli test for blank entrypoint to separate function 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-11 06:00:24 -07:00
Erik Hollensbe 78a847a47a evaluator: ensure entrypoint stays blank if set blank while CMD is set. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-11 06:00:24 -07:00
Erik Hollensbe ac107995ae builder: Fix entrypoint and cmd semantics in evaluator. Test c/o @cnf 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-09-11 06:00:24 -07:00
Alexandr Morozov 2e7cf6b0ce Deallocate port before trying to delete iptables chain 
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-10 00:40:46 +04:00
Tibor Vass 43eab4034b Merge pull request #7938 from unclejack/make_run_test_verbose 
integ-cli: increase verbosity for mem & cpu test
 2014-09-08 14:10:58 -04:00
Michael Crosby 11700512b9 Merge pull request #7920 from unclejack/fix_layer_permissions 
ensure correct permissions are set for directories
 2014-09-08 10:51:50 -07:00
unclejack 05a76477e6 integ-cli: increase verbosity for mem & cpu test 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-08 20:46:45 +03:00
unclejack cc5fb986b0 integ-cli: test correct directory permissions 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-08 20:02:40 +03:00
Jessica Frazelle d2f75a3040 Fix line delimited JSON response 
For GET /events, line delimit JSON.
Fixes #7047

Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com>

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com> (github: )
 2014-09-08 09:41:26 -07:00
Jessica Frazelle f49c3f287b fixes #7802, when api version 1.11 is `json.Marshal`ing the container struct 
Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com>

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jfrazelle@users.noreply.github.com> (github: )
 2014-09-08 09:30:33 -07:00
Tibor Vass 1a2a4f61ab Merge pull request #7878 from LK4D4/fix_net_for_none 
Don't initialize network for 'none' mode
 2014-09-04 15:30:03 -07:00
Alexandr Morozov ba24820284 Don't initialize network for 'none' mode 
Fixes #7837

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-04 09:50:58 +04:00
Tibor Vass 39310448da handle empty envvars for DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in daemon test framework 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-09-03 17:14:19 -07:00
Tibor Vass defe01daf8 fix race in daemon test framework 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-09-03 17:14:19 -07:00
unclejack 6db078dea7 Merge pull request #7191 from tiborvass/test-daemon 
Add Daemon restart test along with Daemon utils
 2014-09-02 22:40:23 +03:00
Tibor Vass a9971a89cc Add TestDaemonRestartWithRunningContainersPorts 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-09-02 12:13:21 -07:00
Tibor Vass 054b921a2c Add Daemon test utils 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-09-02 10:58:36 -07:00
unclejack 1858746978 clean up context on build completion & add test 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-09-02 17:35:25 +03:00
Michael Crosby c0a5ec75c5 Add more error info to TestDockerRunEchoStdoutWithMemoryLimit 
This test fails on my CI server often so we need more info when it does
happen with this test.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-01 17:09:52 -07:00
Michael Crosby 72652c5973 Make nat test less racy and accurate 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2014-09-01 16:54:32 -07:00
Michael Crosby efc6c9ba2f Merge pull request #7825 from LK4D4/move_integration_to_cli 
Move integration to cli
 2014-09-01 11:38:57 -07:00
Michael Crosby 388ed88042 Merge pull request #7812 from erikh/fix_top 
docker top: fix command when multiple arguments are supplied
 2014-09-01 11:31:38 -07:00
Alexandr Morozov 195cee9983
Move TestRunCidFileCheckIDLength to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-01 20:15:20 +04:00
Alexandr Morozov 8892320835
Move TestRunCidFileCleanupIfEmpty to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-09-01 19:55:39 +04:00
Alexandr Morozov c8999dc326 Merge pull request #7817 from cnf/fix_cli_top_test_priv 
Fixed error check using the wrong error value
 2014-08-31 19:24:33 +04:00
Frank Rosquin d93c95a332 Fixed error check using the wrong error value 
errorOut was using the err from the previous test.
same as #7816 but on TestTopPrivileged, which I missed last time

Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com>
 2014-08-31 16:35:38 +02:00
Frank Rosquin 82c536aacd fixed error check using the wrong error value 
errorOut was using the err from the previous test.

Signed-off-by: Frank Rosquin <frank.rosquin@gmail.com>
 2014-08-31 16:21:53 +02:00
Erik Hollensbe d7dd35bbd6 Add a test for the multiple arguments passed to `docker top` 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-31 05:53:05 -07:00
SvenDowideit 4e340cedec List all ports when calling `docker port container` 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-08-29 18:31:51 +10:00
Vincent Batts 79501dcd4f save many: adding an integration-cli test 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2014-08-28 21:33:13 -04:00
unclejack 22b585e0fc Merge pull request #7294 from erikh/fix_multiple_attach_test 
Fix multiple attach test.
 2014-08-28 13:38:28 +03:00
Victor Vieux d9f8d3ea9f Merge pull request #7461 from erikh/rewrite_dockerfile_parser 
Cleanup: Refactor Dockerfile parser
 2014-08-27 23:22:47 -07:00
Alexandr Morozov 3c984a6d15
Add logDone logs where it's missing 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-28 09:25:57 +04:00
Michael Crosby 2a5e29adc6 Merge pull request #7677 from erikh/update_hosts_linked_containers 
Update /etc/hosts when linked container is restarted
 2014-08-27 19:54:09 -07:00
Michael Crosby 77eefbc688 Merge pull request #7672 from cpuguy83/cleanup_volumes_from 
Cleanup: applyVolumesFrom
 2014-08-27 19:43:16 -07:00
Erik Hollensbe cb51681a6d builder: Fix handling of ENV references that reference themselves, plus tests. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-27 18:52:30 -07:00
Victor Vieux 450740c891 Update /etc/hosts when linked container is restarted 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-08-27 18:23:41 -07:00
Victor Vieux 5b27fbc0e2 move TestEntrypoint & TestBindMounts 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-28 00:25:10 +00:00
Victor Vieux eb9379c5d0 move TestKillDifferentUser 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2014-08-27 23:34:37 +00:00
Brian Goff 7495fbc0e3 Cleanup: applyVolumesFrom 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-08-26 20:52:58 -04:00
Michael Crosby 89f64712fa Merge pull request #7702 from LK4D4/fix_panic_on_bad_device_#7701 
Handle error from GetDevice early
 2014-08-26 10:53:40 -07:00
Michael Crosby 228eda4fd5 Merge pull request #7629 from LK4D4/fix_follow_hang_on_stop 
Fix logs -f hanging on stopped containers
 2014-08-25 15:24:20 -07:00
Lei Jitang 7e72ed70f9 add docker import test with a tag. Fixes #7714 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2014-08-26 15:51:22 +08:00
Alexandr Morozov 17b95ecb08
Handle error from GetDevice early 
Also more verbose error.

Fixes panic from #7701

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-24 14:09:30 +04:00
Erik Hollensbe 01094c1568 Fix multiple attach test. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-08-22 03:58:05 -07:00
Alexandr Morozov f04ef96e07
Test for following logs for stopped container 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-20 20:02:56 +04:00
Victor Vieux 94fbcea7a3 Merge pull request #5129 from vieux/host_resolv 
allow /etc/hosts /etc/resolv.conf and /etc/hostname to be changed
 2014-08-20 11:02:36 -05:00
Victor Vieux d4c2d0c57f Merge pull request #7608 from LK4D4/remove_internet_dep 
Remove internet dependency from TestBuildCacheADD
 2014-08-19 14:13:52 -05:00
Victor Vieux fc39f9c78d add tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-08-19 17:06:17 +00:00
Michael Crosby dad2fcb199 Fix search test for busybox image 
Signed-off-by: Michael Crosby <michael@docker.com>
 2014-08-19 09:52:46 -07:00
Alexandr Morozov 075e1bc1c3
Remove internet dependency from TestBuildCacheADD 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-18 14:13:43 +04:00
Alexandr Morozov 391c35c822
Fix go vet warnings 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-13 11:37:30 +04:00
Alexandr Morozov c19e0fe7e2
Move TestRunExit to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-12 13:40:14 +04:00
Alexandr Morozov a44f065f17
Move TestRunWorkdirExistsAndIsFile to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-12 12:22:25 +04:00
Alexandr Morozov 44842ea3d8 Test on untag and delete events 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-11 11:39:47 +04:00
Alexandr Morozov 17ab516fde Test on container events 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
 2014-08-11 10:42:55 +04:00
Michael Crosby 414ccee23a Merge pull request #7374 from cpuguy83/revert_rm_f_deprecation 
Revert --stop/--kill and use SIGKILL instead
 2014-08-07 16:47:25 -07:00
unclejack b36f630817 Merge pull request #7304 from unclejack/refactor_build_tests 
integration cli: minor refactor of the build tests
 2014-08-08 01:24:51 +03:00
Brian Goff 95f86da641 Revert `rm -f` deprecation use SIGKILL instead 
`rm -f` was originally deprecated in favor of `rm --stop/--kill` since `rm
-f` was sending SIGTERM and potentially very slow.
Instead this will bring back `rm -f` but use SIGKILL isntead

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-08-07 18:20:43 -04:00
Michael Crosby 01022a305d Merge pull request #7405 from LK4D4/indicate_run_volume_test_pass 
Print about "copy volume content" test passing
 2014-08-07 15:09:41 -07:00
Tibor Vass 69f9d488dc Move some integration tests to integration-cli 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-08-06 17:18:51 -04:00
Tibor Vass 5e20b0027c Fix TestBuildForbiddenContextPath after TMPDIR change 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
 2014-08-06 14:24:00 -04:00
LK4D4 825ca10dfd Print about "copy volume content" test passing 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-08-04 21:27:28 +04:00
Alexandr Morozov aa2d6dbc0c Inherit Cmd only if no --entrypoint specified on run 
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-08-04 21:17:37 +04:00
LK4D4 1b6546b840 Cleanup Cmd on ENTRYPOINT instruction 
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-08-04 20:48:36 +04:00
Michael Crosby 5d2a62d8de Merge pull request #7295 from vishh/rbind 
Make lxc driver rbind all user specified mounts.
 2014-08-01 10:25:45 -07:00
Michael Crosby b1496effe3 Merge pull request #7312 from tianon/update-libcontainer 
Bump libcontainer dep
 2014-07-31 15:20:07 -07:00
Bruno Renié 27cca4c70c Fix .dockerignore when ignoring unreadable dirs 
The initial `ValidateContextDirectory` implementation fails loudly when a file
lacks read permissions in the current context. However that situation is valid
if the file is included in the `.dockerignore` patterns.

Docker-DCO-1.1-Signed-off-by: Bruno Renié <brutasse@gmail.com> (github: brutasse)
 2014-07-31 15:10:56 -07:00
Tianon Gravi 8ea7242250 Update TestEnvironment to explicitly set "HOME" to be empty so it gets autofilled 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-31 12:46:41 -06:00
Tianon Gravi 57b9467f45 Add support for autodetected HOME from USER (if HOME is unset) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-07-31 12:46:36 -06:00
Vishnu Kannan 3e1c1567ea Add a cli integration test for recursive bind mounting. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2014-07-30 02:23:24 +00:00
unclejack 372f9bb58b integcli: use dockerCmdInDir in build tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-07-29 16:01:56 +03:00
unclejack f60c8e9e61 integcli: add some more docker utils 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-07-29 15:56:41 +03:00
Erik Hollensbe 5931669343 fix docker integration-cli restart test race 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-07-28 23:46:14 -07:00
Tibor Vass 030676444a Merge pull request #7140 from proppy/more-addtar-tests 
integration-cli: add more tests for BuildAddTar
 2014-07-28 11:58:29 -04:00
Tibor Vass da40d9b7a5 Merge pull request #7209 from LK4D4/test_build_from_git 
Test on building from GIT url
 2014-07-28 11:15:50 -04:00
unclejack 7978b32127 Merge pull request #7097 from LK4D4/fix_eof_dockerignore_#7093 
Skip whole dir dockerignoring with warning
 2014-07-28 17:34:44 +03:00
Tibor Vass d082381a93 address a few nits 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-07-25 18:29:47 -04:00
Victor Vieux b3ee9ac74e update go import path and libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-24 22:19:50 +00:00
Alexandr Morozov 5b0d4cf296 Test on building from GIT url 
Also I added fake git server to utils
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-24 11:19:16 +04:00
unclejack d0cbc54f23 integcli: fix TestInspectLinksStopped with Go1.3 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-07-23 01:15:29 +03:00
Johan Euphrosine 5d8e80ba8d integration-cli/TestBuildAddTar: embed Dockerfile 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-07-21 15:02:31 -07:00
Johan Euphrosine 24c00c8508 integration-cli/TestBuildAddTar: generate context from test 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-07-21 13:03:00 -07:00
Johan Euphrosine 30519330c7 integration-cli: add more tests for BuildAddTar 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-07-21 11:56:49 -07:00
LK4D4 e88487b321 Move TestCopyVolumeContent to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-19 12:42:27 +04:00
LK4D4 9a7c5be7d1 Move TestCopyVolumeUidGid to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-19 12:42:27 +04:00
Tibor Vass ac6ec9df1d Merge pull request #6913 from unclejack/map_randomization_fixes 
integcli: fix failures caused by tiny map randomization
 2014-07-19 00:27:37 -05:00
Victor Vieux e52382292f Merge pull request #7098 from fabiofalci/move_ps_tests_to_cli 
Move `docker ps` test to integration cli
 2014-07-18 14:29:40 -07:00
Alexandr Morozov 4162309d11 Tests on container state changing 
It could catch error that was fixed in #6954
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-18 21:51:55 +04:00
Fabio Falci 261dc5e2f6 Move `docker ps` test to integration cli 
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
 2014-07-18 09:43:40 +01:00
Alexandr Morozov 7d97a5f476 Skip whole dir dockerignoring with warning 
Fixes #7093
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-18 09:35:54 +04:00
Victor Vieux 5948b105e7 Merge pull request #7083 from mheon/6983_bugfix 
Fix Panic with -t and -a stderr
 2014-07-17 18:41:24 -07:00
unclejack 68bb56a4a5 integcli: fix map randomization failures 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-07-17 23:11:45 +03:00
unclejack e5e8669c72 integcli: add JSON utils for testing 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-07-17 23:11:40 +03:00
Matthew Heon 1476f295ac Bugfix: only use io.Copy in hijack if attaching both stdout and stderr 
Add regression tests to ensure issue is fixed.

Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
 2014-07-17 13:47:33 -04:00
unclejack be8cea9856 don't allow links to be used with --net=host 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-07-17 00:32:24 +03:00
Michael Crosby 7c19499c63 Allow case insensitive caps for add and drop 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
 2014-07-16 11:47:55 -07:00
Victor Vieux c04230c42b add check for invalid caps 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Victor Vieux 064b5f870d support add and drop in both order 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Victor Vieux 222a6f4401 add basic support for 'all' 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Victor Vieux 8344b6d736 fix job and add tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-11 23:43:21 +00:00
Adrien Folie d689a5e1e2 Add tests for rm with stop and kill options 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-07-11 23:26:08 +00:00
Timothy e855c4b921 Add --device flag to allow additional host devices in container 
We add a --device flag which can be used like:

 docker run --device /dev/sda:/dev/xvda:rwm ubuntu /bin/bash

To allow the container to have read write permissions to access the host's /dev/sda via a node named /dev/xvda in the container.

Note: Much of this code was written by Dinesh Subhraveti dineshs@altiscale.com (github: dineshs-altiscale) and so he deserves a ton of credit.

Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: timthelion)
 2014-07-10 10:35:53 -07:00
Victor Vieux 519319b989 Merge pull request #6931 from tiborvass/merge-5723 
Updated docker logs timestamp to RFC3339 (carrying #5723)
 2014-07-09 14:23:23 -07:00
James Turnbull aa0eca03e6 Updated docker logs timestamp to RFC3339 
Currently the docker logs timestamp flag generates log entries like:

    $ sudo docker logs -ft daemon_dave
    [May 10 13:06:17.934] hello world

It uses Go's StampMilli timestamp to generate the timestamp. The entry
is also wrapped in [ ].

This is non-standard operational timestamp and one that will require
custom parsing.

The new timestamp is RFC3999Nano and generates entries like:

    2014-05-10T17:42:14.999999999Z07:00 hello world

These are readily parsed by tools like ELK.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-07-09 11:59:06 -04:00
Alexandr Morozov fc2631b499 Simple additions to TestBuildAddTar 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-09 13:41:57 +04:00
Michael Crosby f91a97256b Merge pull request #6773 from fabiofalci/restart_tests_to_cli 
Move `docker restart` tests to integration cli
 2014-07-08 17:44:29 -07:00
Sam Rijs 560eb07009 avoid regression in events test 
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
 2014-07-09 00:09:03 +00:00
Sam Reis 46747963b6 Add test for event limitation 
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
 2014-07-09 00:09:03 +00:00
Michael Crosby f0aba1aad4 Merge pull request #6882 from cpuguy83/fix_gh#6856_add_pass_unpause_events 
Add event logs for pause/unpause
 2014-07-08 15:31:23 -07:00
Tibor Vass cfa4999d69 Tests for ADD tar 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-07-08 15:34:04 -04:00
Brian Goff e1ec91fc58 Add event logs for pause/unpuase 
Fixes #6856

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-07-08 15:27:44 -04:00
Victor Vieux 170609e369 Merge pull request #6720 from fabiofalci/relax_dns_search 
Relax dns search to accept empty domain
 2014-07-07 15:12:29 -07:00
Tibor Vass 52c58b9ea0 Merge pull request #6857 from vbatts/vbatts-fix_save_repositories 
docker save: fix the 'repositories' file
 2014-07-07 17:26:52 -04:00
Vincent Batts 600f65b247 docker save: more integration tests 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-07-07 14:58:27 -04:00
Victor Vieux 880c98d2d3 Merge pull request #6859 from LK4D4/move_buildfile_tests_to_cli 
Moved last build tests to integration-cli
 2014-07-07 10:53:26 -07:00
LK4D4 1d4862b7a2 Moved last build tests to integration-cli 
Also removed skipped tests on "viz" and "tree" because they
blocked integration/buildfile_test.go removing.

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-06 15:36:34 +04:00
Fabio Falci 804b00cd7d Relax dns search to accept empty domain 
In that case /etc/resolv.conf will be generated with no search
option. Usage: --dns-search=.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
 2014-07-04 09:33:53 +01:00
Adrien Folie f337a52a6e Move TestGetImagesByName 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-07-03 01:39:08 +02:00
Fabio Falci 9da6c80533 Move `docker restart` tests to integration cli 
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
 2014-07-02 21:56:19 +01:00
Tibor Vass f357b18ee3 Merge pull request #6780 from unclejack/tweak_cli_integration_tests 
Tweak cli integration tests
 2014-07-02 13:16:26 -04:00
unclejack deb57c5144 Merge pull request #6763 from folieadrien/master 
Migrate TestGetImagesHistory into unit and CLI test
 2014-07-02 19:44:21 +03:00
unclejack dad4768037 integcli: add & use pullImageIfNotExist for pulls 
This speeds up the tag cli integration tests by about 20 seconds.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-07-02 18:45:11 +03:00
Alexandr Morozov 1dc0caf9c0 Implement tail for docker logs 
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-01 23:44:12 +04:00
Victor Vieux 957c510d72 updated docs & tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-01 17:10:00 +00:00
Eric Windisch 17d870bed5 Pause/freeze containers during commit 
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.

Fixes bug: #6267
Fixes bug: #3675

Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com> (github: ewindisch)
 2014-07-01 00:30:21 +00:00
unclejack 63e28cc363 make TestRemoveContainerRunning handle signals 
This lowers the test execution time by about 5 seconds.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-06-30 22:25:50 +03:00
unclejack eb1e8e884d integration cli: add imageExists to docker utils 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-06-30 22:22:29 +03:00
Adrien Folie 9a2771eac2 Migrate TestGetImagesHistory into unit and CLI test 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-06-30 01:31:16 +02:00
Michael Crosby 3aa75210c4 Merge pull request #6721 from LK4D4/integration_test_on_links 
Integration cli tests on Links in inspect
 2014-06-27 13:29:13 -07:00
Alexandr Morozov 08182da5d8 Integration cli tests on Links in inspect 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-27 22:44:13 +04:00
unclejack 38b005ec69 integcli: add test to ensure -v /:/ isn't allowed 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-06-27 19:51:24 +03:00
unclejack 510f1ba438 Merge pull request #6701 from crosbymichael/mount-root 
Allow / as source of -v
 2014-06-27 19:03:21 +03:00
Tibor Vass 6e3fe93148 Merge pull request #6579 from vieux/dockerignore 
Rebased Dockerignore
 2014-06-26 21:00:43 -04:00
Michael Crosby 012091a28f Fix sleep command in tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
 2014-06-26 17:09:41 -07:00
Travis Cline 9189db3aff Add .dockerignore support 
Fixes #2224

Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
 2014-06-26 22:49:08 +00:00
Michael Crosby e39b8eade1 Allow / as source of -v 
We discussed this at the docker plumbers meetup and for tools and
working on the system for things like boot2docker and coreos this is
needed.  You can already bypass this check so we felt it is ok to start
allowing this feature.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
 2014-06-26 10:50:18 -07:00
Michael Crosby d91b8bcf0b Merge pull request #6646 from tiborvass/fix-workdir 
Fix --workdir=/
 2014-06-25 15:19:51 -07:00
Erik Hollensbe 03c5c1930d fix whitespace that precedes the escape in a multiline string. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-06-25 13:39:47 -07:00
Tibor Vass baacc7006b add integration test for --workdir=/ 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-06-25 11:02:59 -04:00
Tibor Vass 385c9b1a08 fix bug in FollowSymlinkInScope when link == root 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-06-25 11:02:59 -04:00
Victor Vieux dd258553b1 Fix search integration-cli test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-06-24 21:16:34 +00:00
Guilherme Salgado 1c291ccbbe Migrate TestGetEvents into a unit and a CLI test 
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
 2014-06-24 17:43:26 +02:00
Johan Euphrosine edcb41451a api/client/build: allow tar as context for docker build - 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-06-23 13:34:09 -07:00
LK4D4 386d1ecc6e Move sorter_test from integration to integration-cli 
TestServerListOrderedImagesByCreationDateAndTag was redundant and broken
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-23 22:19:52 +04:00
unclejack a5f5d5e8d7 Merge pull request #6571 from vbatts/vbatts-raw_json 
raw json for `docker save`
 2014-06-20 23:55:10 +03:00
cyphar a57298791c integration-cli: add build test for NOCACHE 
This patch adds CLI integration tests to ensure that NOCACHE instructions
in Dockerfiles only apply to direct children of the original image.

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
 2014-06-19 20:33:17 +10:00
Victor Vieux 7a0e599142 Merge pull request #6066 from tiborvass/5693-volumes-from-symlink-path 
5693 volumes from symlink path
 2014-06-18 16:10:37 -07:00
Michael Crosby d803523cdc Merge pull request #5559 from bmurphy1976/bmurphy1976-history-bug 
Test and fix history command ordering
 2014-06-18 14:34:00 -07:00
Tibor Vass def86d0cf4 rename TestVolumeWithSymlink to TestCreateVolumeWithSymlink and remove run_tests folder 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-06-18 15:51:27 -04:00
Tibor Vass c4c92e66cd add integration test 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
 2014-06-18 15:50:39 -04:00
LK4D4 f08cd445b0 Fix go vet errors 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-06-18 17:39:57 +00:00
unclejack ec0fb311ed Merge pull request #6415 from LK4D4/increase_timeout_in_test_attach 
Increase time before exit in TestMultipleAttachRestart
 2014-06-18 00:36:18 +03:00
Alexandr Morozov cc42eeac21 Move TestBuildAddToSymlinkDest to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-17 23:44:30 +04:00
Alexandr Morozov 690711b584 Move TestBuildOnBuildForbiddenMaintainerTrigger to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-17 11:39:47 +04:00
Alexandr Morozov 1c8ec01c55 Move TestBuildOnBuildForbiddenFromTrigger to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-17 11:36:45 +04:00
Alexandr Morozov 1e0e86360f Move TestBuildOnBuildForbiddenChainedTrigger to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-17 11:24:47 +04:00
Alexandr Morozov 2629e2ec23 Move TestBuildOnBuildTrigger to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-17 11:14:45 +04:00
Alexandr Morozov 08a10f936b Move TestBuildFailsDockerfileEmpty to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-17 11:06:44 +04:00
Alexandr Morozov d3023f25f5 Move TestBuildFails to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-17 11:06:40 +04:00
Alexandr Morozov f1d7ed35bd Move TestBuildInheritance to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-17 11:05:45 +04:00
Alexandr Morozov 62d97afaf8 Move TestBuildADDFileNotFound to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-17 11:05:36 +04:00
Alexandr Morozov 686786f107 Move TestForbiddenContextPath to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-17 10:38:45 +04:00
Alexandr Morozov c5b82f5e8d Move TestBuildEntrypointRunCleanup to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-17 10:16:36 +04:00
Victor Vieux 6228761f67 add a test using the flags 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-06-17 01:05:13 +00:00
Victor Vieux 614c57c521 improve test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-06-17 00:59:51 +00:00
LK4D4 eb97163348 Increase time before exit in TestMultipleAttachRestart 
Sometimes third attacher attaching to already stopped container.
Also I've changed prefix to attach and fixed cleanup on Fatal.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-13 21:40:30 +04:00
Victor Vieux 9494643bf1 add test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-06-12 19:11:51 +00:00
Bryan Murphy e827c8ff61 Add integration test for history command and fix bug where history 
would occasionally be returned in the incorrect order if sequential
layers had the same created time.

Docker-DCO-1.1-Signed-off-by: Bryan Murphy <bmurphy1976@gmail.com> (github: bmurphy1976)
 2014-06-09 10:45:54 -05:00
unclejack 2f72fdf6ea Merge pull request #6145 from shykes/pr_out_pkg_testutils_utility_functions_to_facilitate_writing_go_tests 
pkg/testutils: utility functions to facilitate writing Go tests
 2014-06-06 01:26:53 +03:00
SvenDowideit 5febba93ba IANA allocated Docker port: 2375 
2375/2376 are assigned:
http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker

For #1440

Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-06-04 06:54:19 +10:00
Victor Marmol 5bf4068d60 Merge pull request #6171 from crosbymichael/add-chroot 
Add SYS_CHROOT cap to unprivileged containers
 2014-06-02 18:33:34 -07:00
Michael Crosby 41f7cef2bd Add SYS_CHROOT cap to unprivileged containers 
Fixes #6103
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-06-02 18:23:47 -07:00
Michael Crosby c024c9bd1e Add test for volume ownership and perms 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-06-02 18:10:52 -07:00
Michael Crosby f65fadbda0 Merge pull request #6143 from LK4D4/move_some_more_tests_to_cli 
Move some more tests to integration cli
 2014-06-02 18:06:11 -07:00
Victor Vieux b8932abcd3 pull only busybox:latest 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-06-02 19:54:17 +00:00
LK4D4 ae128437ce Move build cache tests to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-02 23:40:14 +04:00
LK4D4 bf4d907092 More verbose build tests 
I've decided that custom asserts only hide the meaning of tests
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-02 23:40:13 +04:00
LK4D4 2e85568816 Aux functions for build testing 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-06-02 23:40:13 +04:00
Michael Crosby 3e13aaec00 Merge pull request #6130 from vieux/standardize_api_keys 
Standardize api keys to CamelCase
 2014-06-02 12:03:11 -07:00
Solomon Hykes 0a06e9bd91 Fix format in maintainers files 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-06-02 07:05:06 +00:00
unclejack 2024a0e517 Merge pull request #6089 from unclejack/docker_build_copy 
add support for COPY to docker build
 2014-06-01 01:26:31 +03:00
Victor Vieux 68fb7f4b74 Standardize API keys: CamelCase 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-31 01:22:07 +00:00