p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,834 Commits 2 Branches 295 Tags
afe8e130e04512021c322dd33feec460b4792bc9
Commit Graph

375 Commits

Author SHA1 Message Date
Rafe Colton
afe8e130e0 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>
Upstream-commit: 30d5a42c1f24e26f681b7330249f04fec891aee9
Component: engine
 2014-09-29 23:23:36 -07:00
Victor Vieux
1a11728b82 Merge pull request #8289 from duglin/FixTestcaseFor8230 
Fixes the new testcase for PR #8230
Upstream-commit: 7c1aee62910405720f977e5777fafefc662dc175
Component: engine
 2014-09-29 15:33:51 -07:00
Doug Davis
1cba9ff5e0 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>
Upstream-commit: 8b3fbac15c0579c1372f3e13f607c1001d149d16
Component: engine
 2014-09-29 13:35:09 -07:00
Tibor Vass
3dce9f533b Merge pull request #8284 from erikh/fix_cmd_again 
builder: Fix CMD to inject /bin/sh -c when provided with a non-json value
Upstream-commit: 670c8696a29825b23208496bd4d8e88b5faa7773
Component: engine
 2014-09-29 15:56:16 -04:00
Erik Hollensbe
f56118757d 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)
Upstream-commit: 9f142bf9be0174bf957812d1045a7cf0aa34ad88
Component: engine
 2014-09-29 12:22:18 -07:00
Erik Hollensbe
3ecb3c4d7a Merge pull request #8230 from duglin/Issue6820 
add wildcard support to COPY/ADD (part 2 of issue #6820)
Upstream-commit: 1cd6135972bda50f913315910baba1b17d097338
Component: engine
 2014-09-29 11:19:01 -07:00
Daniel, Dao Quang Minh
ad9bd3a850 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)
Upstream-commit: 8833d800bf622dcb6a66da0fe4c7a61a1620b62c
Component: engine
 2014-09-29 06:21:54 -04:00
Brian Goff
e55f8da518 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)
Upstream-commit: 882223c0f8a55c2011277aba08f1487a2930c075
Component: engine
 2014-09-26 14:36:44 -04:00
Michael Crosby
acaefc427a Merge pull request #8233 from tiborvass/pr-7658 
Fix Interactive container hangs when redirecting stdout
Upstream-commit: 0bb5f987315a51ef39f5fb070bff03c2849d059d
Component: engine
 2014-09-26 11:31:29 -07:00
Tibor Vass
07bda71556 Merge pull request #8224 from cpuguy83/7843_fix_start_attach_error_hang 
Fix #7843 start -a can cause frozen term
Upstream-commit: 07da2e03b14c91f464f9fdfdbe8848ae8fc3725e
Component: engine
 2014-09-26 11:54:39 -04:00
Brian Goff
a47e9ab2de 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)
Upstream-commit: 9ae9d7db574083ce6233b33e8b0bbefb219d7fe6
Component: engine
 2014-09-26 11:31:02 -04:00
Doug Davis
fbb83ba5bc add wildcard support to copy/add 
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: acd40d50799a117c4e7c318abdbc8c14b9eb1632
Component: engine
 2014-09-25 20:44:51 -07:00
Tibor Vass
001f52b09b Merge pull request #8193 from jfrazelle/8141-pull-all-image-aliases-for-id 
Pull all image aliases for id
Upstream-commit: 1379c6ec504f348454796b0ac1d46025c183bb4e
Component: engine
 2014-09-25 15:22:46 -04:00
Tibor Vass
1375b67b05 Add DockerCli tests 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 29a62ceefc62836cc918093b60aef6b23a649d76
Component: engine
 2014-09-25 20:58:43 +02:00
Jessica Frazelle
4092cbb7ff Pull all image aliases for id. Closes #8141. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7d74be162c9704df848c865a9b4bcd4047da9124
Component: engine
 2014-09-25 11:48:49 -07:00
Victor Vieux
8be9986ecc Merge pull request #8208 from estesp/7851-fix-hostname-fqdn 
Provide full hostname with domainname to underlying container layer
Upstream-commit: 857b739e29be658dd08974cd81752257b1d6f386
Component: engine
 2014-09-25 11:33:50 -07:00
Tibor Vass
d851131502 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.
Upstream-commit: d369612b416484301e172bfae3fc692e9c176faf
Component: engine
 2014-09-25 12:45:48 -04:00
Erik Hollensbe
cdd6c2350b 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)
Upstream-commit: a5ca549a18fb5c1006005cc220ab330eec3018de
Component: engine
 2014-09-25 09:44:19 -07:00
Phil Estes
113374480e 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)
Upstream-commit: 5239ba3d06b2efccd986231a93e839d4693d2d0c
Component: engine
 2014-09-25 09:23:39 -04:00
Victor Vieux
ad7640867a Merge pull request #8207 from LK4D4/rewrite_more_fixtures_test 
Rewrite more fixtures test to not use fixtures.
Upstream-commit: a9368422081a6cbe8b0a77b506bd9684d61c7876
Component: engine
 2014-09-24 15:07:03 -07:00
unclejack
8f469a064b Merge pull request #8173 from crosbymichael/update-mem-limit 
Update memory limit for container
Upstream-commit: f2fad5c2901240cb1b9e3e5747b0334a5b383978
Component: engine
 2014-09-24 20:55:25 +03:00
Alexandr Morozov
32980488fe Rewrite TestContextTar tests to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: d302d9296125d2c7abf4adf992fd6739a19d5fbd
Component: engine
 2014-09-24 17:09:18 +04:00
Alexandr Morozov
ba92a9eabd Rewrite TestBuildWithInaccessibleFilesInContext to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 51a56399f6384decee03a7e1aa56a3f46cb7c63f
Component: engine
 2014-09-24 17:09:14 +04:00
Alexandr Morozov
beff003be9 Rewrite TestBuildRm to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 52cf331206b9e50ba9b52f950b5a377179cf7aa5
Component: engine
 2014-09-24 13:15:55 +04:00
Alexandr Morozov
a1e93ec56c Rewrite TestBuildHistory to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: ab4738b49fa72b5ac1d5cc441f6e5bb4328a04c6
Component: engine
 2014-09-24 12:38:48 +04:00
Alexandr Morozov
49a6b8858b Rewrite TestBuildForceRm to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 1625cbfc4c02843ff0fbbf43bd46c13698609f2a
Component: engine
 2014-09-24 12:29:27 +04:00
Victor Vieux
7f18ab2efd Merge pull request #7973 from LK4D4/persist_execdriver_dir 
Persist execdriver dir
Upstream-commit: 827634d355bcbda3e75a05598022edf2262a2585
Component: engine
 2014-09-23 16:01:03 -07:00
Victor Vieux
3c0e9292e2 Merge pull request #8186 from duglin/ErrInCopyCache 
Make sure COPY/ADD on dirs doesn't grab too many files
Upstream-commit: 81a643211bbd88545d21550defc9cd7e3f8437bd
Component: engine
 2014-09-23 15:16:57 -07:00
Doug Davis
c65c43b413 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>
Upstream-commit: cd329d062bddaffcfea3ac0cd3245c0be5bf5542
Component: engine
 2014-09-23 14:16:00 -07:00
Erik Hollensbe
e73a233371 builder: properly communicate onbuild trigger information during 
subsequent builds.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 8edacc673a0ecb4320377457f0bf9dbdaa08f843
Component: engine
 2014-09-23 13:55:51 -07:00
Tibor Vass
c9783e2c8a Merge pull request #8179 from erikh/parser_fix_cmd_null 
Parser fix cmd null
Upstream-commit: 5ce7ee61efd1926ae601de8bd98544ba25c6d235
Component: engine
 2014-09-23 13:42:55 -04:00
Alexandr Morozov
733cfbef1c Rewrite TestBuildAddWholeDirToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 0c899cefdd2f1826d16bd979651003a9502888e9
Component: engine
 2014-09-23 18:58:32 +04:00
Alexandr Morozov
02962cb6ce Rewrite TestBuildAddEtcToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 570f1153b9b09fc8b23b86a15fd6f37c2f873a67
Component: engine
 2014-09-23 18:58:28 +04:00
Alexandr Morozov
82b1f11dad Rewrite TestBuildAddDirContentToExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: c58391bbd03a6dd71096fb2d7541e10fa9123e27
Component: engine
 2014-09-23 15:15:58 +04:00
Alexandr Morozov
842da56368 Rewrite TestBuildAddDirContentToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 2d802d7f23ad0d9f59abd8144f2bad094e338339
Component: engine
 2014-09-23 15:15:58 +04:00
Alexandr Morozov
a1258eabee Rewrite TestAddSingleFileToNonExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 139b6ed3aa81d5d3c6ceaacc5041afca4d39d75a
Component: engine
 2014-09-23 15:15:58 +04:00
Alexandr Morozov
6826b77d3f Rewrite TestAddSingleFileToExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 6bb44b6d7441d1a2b7136063a73c31c946be625f
Component: engine
 2014-09-23 15:15:58 +04:00
Alexandr Morozov
1fda8e299f Rewrite TestAddSingleFileToWorkdir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 5e2ea69606850cf2da1c50ec4bc32c981999aafd
Component: engine
 2014-09-23 15:15:58 +04:00
Alexandr Morozov
2e55c2075c Rewrite TestAddSingleFileToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 682fbe0134180488c1a7f2b755b6bb9ae09e9448
Component: engine
 2014-09-23 15:15:09 +04:00
Alexandr Morozov
08a3014c75 Rewrite TestBuildSixtySteps to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 3824ec62e81d78db4dd36ffd64b17ef4c620b47f
Component: engine
 2014-09-23 15:15:09 +04:00
Erik Hollensbe
ef9cb160c9 builder: integration-cli test for the previous commit. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: d1613e1d59d0a1e29feafe0537d12675dee24f39
Component: engine
 2014-09-22 23:18:46 -07:00
Michael Crosby
ca46c61b42 Update memory limit for container 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 9b755412ab03816f0b7d6013618c65ae68781bcb
Component: engine
 2014-09-22 21:41:14 +00:00
Alexandr Morozov
ab2c20ea99 Test on execdriver dir behavior 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 652cd6a842377ec55b53333c7ddc0fc50b587a99
Component: engine
 2014-09-22 22:49:21 +04:00
unclejack
3afe5f7408 integcli: add & use dockerCmdWithTimeout & InDir 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: c6965e3e45cc1c46afc885c57e0e6b9a7769722c
Component: engine
 2014-09-22 21:02:51 +03:00
unclejack
cf1e3ce7c5 integcli: add util to fetch container status 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 5d1cb9d0051c5263e23f06ccb431481f8e5b3d57
Component: engine
 2014-09-22 20:34:57 +03:00
unclejack
5314f1d0ea integcli: consolidate cmd exit code processing 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 97b50e0f292847a8e3f166aa9386f3e51b1c5e95
Component: engine
 2014-09-22 20:32:50 +03:00
unclejack
901086a5c9 integcli: pull scratch for pull test 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 77d29847e2a59a7b3e56144c774c28a3b7370c91
Component: engine
 2014-09-22 19:03:19 +03:00
unclejack
18f1860b4a integcli: fix race in runCommandWithStdoutStderr 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: c69896d8a013fca05ffee479e08605552715f901
Component: engine
 2014-09-22 17:53:12 +03:00
Alexandr Morozov
4420332c09 Merge pull request #8137 from jfrazelle/8135-event-log-die-start-fail 
After container fails to start, log the event die.
Upstream-commit: 5ad82d3ea641a9cc569fc49853759bb98f043fa9
Component: engine
 2014-09-22 12:47:04 +04:00
Jessica Frazelle
b74caf4edc 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)
Upstream-commit: d64d55eca85232af721859a8cc6f20ff473ce94c
Component: engine
 2014-09-19 16:06:49 -07:00