0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
48972 commits 14 branches 412 tags 338 MiB
Commit graph

5698 commits

Author SHA1 Message Date
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