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

96 Commits

Author SHA1 Message Date
Brian Goff
ba6185d6ef 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>
Upstream-commit: e95b6fb648ab6301b556192a9730a843fab7209f
Component: engine
 2014-10-06 14:21:46 -04:00
Andrea Luzzardi
505d3e474a Merge pull request #8392 from jfrazelle/pr_8389 
Invalid mount mode for volumes in
Upstream-commit: 84d9fd37b05c22a61af2ab86c6783089b456790b
Component: engine
 2014-10-03 17:22:21 -07:00
Jessica Frazelle
143d6d0145 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)
Upstream-commit: b10b458b6ef8327268676744a7c3230e33c9baf6
Component: engine
 2014-10-03 16:17:51 -07:00
Brian Goff
c05ce270f8 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)
Upstream-commit: 007b4f63409c6c642fb075640a8ec7d58825edc8
Component: engine
 2014-10-03 16:55:39 -04:00
Andrea Luzzardi
bad1803f92 Stable MAC addresses: Add support for MAC address restoring. 
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: b669025949f1dba1ad3af9bab6711736863d6e24
Component: engine
 2014-10-03 13:46:24 -07:00
Andrea Luzzardi
5b30bf9410 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>
Upstream-commit: a4875937293f3b0a8ffc569608bbca40a456e9c8
Component: engine
 2014-10-03 13:46:24 -07: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
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
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
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
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
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
Brian Goff
1ce355084d Split volumes out from daemon 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 45407cf00af95b04dd2ff11ce330dd397bf1e095
Component: engine
 2014-09-19 17:47:47 -05:00
Alexandr Morozov
1390b58ea2 Use prefix naming for docker_cli_run_test.go 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: aa536b27a7897373384ab0335c44f44b0bb83455
Component: engine
 2014-09-19 21:56:24 +04:00
Jessica Frazelle
5770448fc1 test for panic on daemon restart 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 42dafe4bd84842532361a2d704493d124f438ab1
Component: engine
 2014-09-18 21:54:42 +00:00
Tim Hockin
604739ede9 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>
Upstream-commit: 68e48b65a64df10fc797cbaa89d6caa2188eadc9
Component: engine
 2014-09-16 23:38:23 +00:00
Brian Goff
1f9dd77aaf Fix #7792 - Order mounts 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 0a3211f131b63b0646be4a19c3ea5147bd557844
Component: engine
 2014-09-16 14:51:06 -07:00
Alexandr Morozov
d25c9ab27a Merge pull request #8062 from vishh/run_in_phase2 
Add support for 'docker exec' - phase 2
Upstream-commit: 00fd008170e463426001ec4c56fc4c39450fd8d0
Component: engine
 2014-09-16 23:56:12 +04:00
Vishnu Kannan
4922ee637c Adding integration tests for docker exec feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: d980589de6e086d1b4c62cc7495bd952c394890b
Component: engine
 2014-09-15 16:59:59 +00:00
Erik Hollensbe
d8cb453d89 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)
Upstream-commit: 09b700288e4804162ef86c99466e08b6b016e0c4
Component: engine
 2014-09-13 11:27:34 -07:00
Michael Crosby
7af7544c23 Merge pull request #7934 from LK4D4/fix_double_allocation 
Fix error propagation from userland-proxy
Upstream-commit: a96811272a7fbc695a1c3cc9931bb8b9f784978e
Component: engine
 2014-09-12 11:39:10 -07:00
unclejack
35e640c370 integ-cli: better debug output for run & import 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 3ec564bfda57f068aac813f4b985385c1c7e4f23
Component: engine
 2014-09-12 16:51:21 +03:00
Alexandr Morozov
06ff531f43 Fix my own comments from #7927 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 41e9e93e27ccd637d9490412622529bdc7d7b8ff
Component: engine
 2014-09-12 10:05:07 +04:00
Tibor Vass
d6bc3658af Add Test for port allocation bug (port already in use by other programs than docker) 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 3109fc9537682a7b9ee566f3674484b1b2296707
Component: engine
 2014-09-12 09:51:14 +04:00
Alexandr Morozov
73455edf0c Deallocate port before trying to delete iptables chain 
Fixes #7954
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 2e7cf6b0cec3e5cc6f05fa5011cf7b5e49a44ae4
Component: engine
 2014-09-10 00:40:46 +04:00
unclejack
ff6065975e integ-cli: increase verbosity for mem & cpu test 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 05a76477e6a70975b1c60637c3f8e2d7a507c490
Component: engine
 2014-09-08 20:46:45 +03:00
Alexandr Morozov
dc74831ee4 Don't initialize network for 'none' mode 
Fixes #7837

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: ba24820284a7a87642f2b668987c1627d6977ea2
Component: engine
 2014-09-04 09:50:58 +04:00
Michael Crosby
ef9df7ad17 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>
Upstream-commit: c0a5ec75c5a8f2d3ccb2f0c1a90f30bb20cdd60b
Component: engine
 2014-09-01 17:09:52 -07:00
Alexandr Morozov
4f814a8405 Move TestRunCidFileCheckIDLength to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 195cee99839a77afec7aaf7fe43cb5a9ceae4f57
Component: engine
 2014-09-01 20:15:20 +04:00
Alexandr Morozov
797834a228 Move TestRunCidFileCleanupIfEmpty to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 8892320835ad2b21b0efd4848d2af0d8a791a8e9
Component: engine
 2014-09-01 19:55:39 +04:00
Alexandr Morozov
def10d2ed4 Add logDone logs where it's missing 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 3c984a6d1578947c5adfe13993cb28d88a674bbf
Component: engine
 2014-08-28 09:25:57 +04:00
Michael Crosby
364fb8763b Merge pull request #7677 from erikh/update_hosts_linked_containers 
Update /etc/hosts when linked container is restarted
Upstream-commit: 2a5e29adc62b0a45e7548c51e5cebc4855d54b48
Component: engine
 2014-08-27 19:54:09 -07:00
Michael Crosby
a040de5fce Merge pull request #7672 from cpuguy83/cleanup_volumes_from 
Cleanup: applyVolumesFrom
Upstream-commit: 77eefbc68894c77862608632822619abfc0c58d6
Component: engine
 2014-08-27 19:43:16 -07:00
Victor Vieux
ac32065d5c Update /etc/hosts when linked container is restarted 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 450740c891c60dda15b7abe29f35b8e142c2c40e
Component: engine
 2014-08-27 18:23:41 -07:00
Victor Vieux
c2d0e99a2a move TestEntrypoint & TestBindMounts 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 5b27fbc0e27358b794946fe9e84a83a6c4497be4
Component: engine
 2014-08-28 00:25:10 +00:00
Brian Goff
054561d764 Cleanup: applyVolumesFrom 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 7495fbc0e3f23c932562cb02ea6e7df204d29dfa
Component: engine
 2014-08-26 20:52:58 -04:00
Alexandr Morozov
81067d8cbd Handle error from GetDevice early 
Also more verbose error.

Fixes panic from #7701

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 17b95ecb08f1705bd74d6c94c8bcfd4c87ccfca6
Component: engine
 2014-08-24 14:09:30 +04:00
Victor Vieux
fb74f9294f add tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: fc39f9c78d89332d2364c4781010f5fb4b500fe4
Component: engine
 2014-08-19 17:06:17 +00:00
Alexandr Morozov
855652ad6c Move TestRunExit to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: c19e0fe7e2c626218c854aa97fd3f23d29f11615
Component: engine
 2014-08-12 13:40:14 +04:00
Alexandr Morozov
3f9bc8ad8a Move TestRunWorkdirExistsAndIsFile to integration-cli 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: a44f065f171cb91867630e752c09fde4b01d4c98
Component: engine
 2014-08-12 12:22:25 +04:00
Michael Crosby
80a9f6e508 Merge pull request #7405 from LK4D4/indicate_run_volume_test_pass 
Print about "copy volume content" test passing
Upstream-commit: 01022a305d7b822ff9740dd0ce992064bffbd4d8
Component: engine
 2014-08-07 15:09:41 -07:00
LK4D4
40ff72d2d0 Print about "copy volume content" test passing 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 825ca10dfdaedfef17d92d898208c6f7e6dcb8e5
Component: engine
 2014-08-04 21:27:28 +04:00
Alexandr Morozov
c9f0913ee9 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)
Upstream-commit: aa2d6dbc0c64efb515646dd2d339ff857c94c3b7
Component: engine
 2014-08-04 21:17:37 +04:00
Michael Crosby
be8ae878bc Merge pull request #7295 from vishh/rbind 
Make lxc driver rbind all user specified mounts.
Upstream-commit: 5d2a62d8de5422b29daa12eef9bd475e2a9b1cb4
Component: engine
 2014-08-01 10:25:45 -07:00
Tianon Gravi
15ebfed254 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)
Upstream-commit: 8ea72422502d65421bc36dda48d384588f519a77
Component: engine
 2014-07-31 12:46:41 -06:00
Tianon Gravi
cdc00db1ec 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)
Upstream-commit: 57b9467f45571c1bd98ebe4b73c6cf3d97ff051c
Component: engine
 2014-07-31 12:46:36 -06:00
Vishnu Kannan
90b29cb0b4 Add a cli integration test for recursive bind mounting. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 3e1c1567eac59c7b808d37aa45f82ce67227e59c
Component: engine
 2014-07-30 02:23:24 +00:00
Victor Vieux
6ae4c9014c update go import path and libcontainer 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
 2014-07-24 22:19:50 +00:00