docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-15 07:40:57 +03:00
Code Activity
10,541 Commits 12 Branches 295 Tags
f321bfe40ff1a930ba7c5d52bac5143fc314cccc
Commit Graph

298 Commits

Author SHA1 Message Date
Alexander Larsson
b187bcdd06 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)
Upstream-commit: b0cb37fd3bd65b27a63954b36507a9782088cfc4
Component: engine
 2014-09-16 18:40:24 -04:00
Jessie Frazelle
bcad074599 Merge pull request #7976 from duglin/Issue7902 
Fix for issue 7902 - add trailing zeros to timestamps so logs align
Upstream-commit: 51b26853ef2f124ea837364c02585cbf96999d6a
Component: engine
 2014-09-16 13:55:03 -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
Tibor Vass
258946589c Merge pull request #8054 from estesp/6830-fix-json-strings 
Proper JSON handling of strings that could be represented as other types
Upstream-commit: f88e2e8b99c4f9a4e58f14f29dc9286931c92f0d
Component: engine
 2014-09-16 15:11:25 -04:00
Phil Estes
dbf2eb7488 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)
Upstream-commit: 1b0b1ec65729a2e018df1334b70b851714995e9e
Component: engine
 2014-09-16 13:51:02 -04:00
Doug Davis
a36831cc2a 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>
Upstream-commit: cd7a5f5c0998f288f71d307076e661ed54f1a5f1
Component: engine
 2014-09-16 10:28:37 -07:00
unclejack
86091bac44 integ-cli: fix TestImportDisplay & add FileServer 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 9e5592d6a10ce02fb77244c7de3fff38958e0b89
Component: engine
 2014-09-16 01:54:21 +03:00
Jessica Frazelle
c472fc422b 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)
Upstream-commit: 985fae256f3fcaea5cf67581ae3d83a46bc52d9e
Component: engine
 2014-09-15 15:17:50 -07:00
Alexandr Morozov
3da88c8c53 Merge pull request #8020 from erikh/rewrite_hosts_files 
Links v2: Mutable network files
Upstream-commit: fbae71326ccc24f6be720f64e0ea48c59376452b
Component: engine
 2014-09-15 23:03:30 +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
unclejack
8ef9f79072 clean up the context when a build fails 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 31c0039022234972c79947a6299c0fa382436487
Component: engine
 2014-09-15 16:01:23 +03:00
unclejack
eb7e1f51d1 Merge pull request #8010 from LK4D4/fix_ps_s_hang_#7999 
Fix ps -s hang
Upstream-commit: c751e1739d56e38aa9a813c369d78c6dbdc37b07
Component: engine
 2014-09-15 13:54:29 +03: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
1a0325cec5 Test for docker ps -s 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 41cbce8c005c201169e13902d62112ced9902928
Component: engine
 2014-09-12 11:45:50 +04: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
Michael Crosby
2bf1cd4824 Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag 
Failing to remove an image, will not remove the image name/tag.
Upstream-commit: 32b5d145faac9013f9f78adfe3bb2a171d818863
Component: engine
 2014-09-11 18:06:18 -07:00
Michael Crosby
d6e3f1dab9 Merge pull request #7996 from estesp/7943-validate-tagnames 
Validate tag names similar to repository name validation; add tests
Upstream-commit: 98e409172cb5872e0b081244bf8802e4a422d735
Component: engine
 2014-09-11 15:19:50 -07:00
Phil Estes
31470054b1 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)
Upstream-commit: 46eb4140c915e05a893080b34b42e25b6a75de7b
Component: engine
 2014-09-11 17:52:36 -04:00
Jessica Frazelle
ad8c137992 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)
Upstream-commit: b2efdc538de47d37718b8972cd6703be32fc23c2
Component: engine
 2014-09-11 11:29:25 -07:00
Erik Hollensbe
665c625297 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)
Upstream-commit: 576416c99a0ae8ad27467f217ec21f598e4f4cc8
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
b3a58e1095 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)
Upstream-commit: 78a847a47ac777f4090c06a82e875ee30f9a1cbd
Component: engine
 2014-09-11 06:00:24 -07:00
Erik Hollensbe
76991d395e 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)
Upstream-commit: ac107995ae4a24195f8bb6b70c26393a87d19982
Component: engine
 2014-09-11 06:00:24 -07: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
Tibor Vass
a07f296d31 Merge pull request #7938 from unclejack/make_run_test_verbose 
integ-cli: increase verbosity for mem & cpu test
Upstream-commit: 43eab4034b1a88e8f68ce96be44643475201d94d
Component: engine
 2014-09-08 14:10:58 -04:00
Michael Crosby
e6516d4319 Merge pull request #7920 from unclejack/fix_layer_permissions 
ensure correct permissions are set for directories
Upstream-commit: 11700512b90e093824647bcbbbdfa26ddafea7cc
Component: engine
 2014-09-08 10:51:50 -07: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
unclejack
71e8f9134d integ-cli: test correct directory permissions 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: cc5fb986b03ce28075a9f3aee248d401f3be0c96
Component: engine
 2014-09-08 20:02:40 +03:00
Jessica Frazelle
0db8f36c75 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: )
Upstream-commit: d2f75a3040e72562ffa825d5c3efa7004af2640a
Component: engine
 2014-09-08 09:41:26 -07:00
Jessica Frazelle
2ff1cc83fb fixes #7802, when api version 1.11 is json.Marshaling 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: )
Upstream-commit: f49c3f287b0d26dc705940effa0ec03e1de7bb99
Component: engine
 2014-09-08 09:30:33 -07:00
Tibor Vass
0f1377200f Merge pull request #7878 from LK4D4/fix_net_for_none 
Don't initialize network for 'none' mode
Upstream-commit: 1a2a4f61abb3a5b40de70b10f39c90d7593679a5
Component: engine
 2014-09-04 15:30:03 -07: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
Tibor Vass
7f4f710d0d handle empty envvars for DOCKER_GRAPHDRIVER and DOCKER_EXECDRIVER in daemon test framework 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 39310448da1ed05d39f4400a56dd43e71591ae5b
Component: engine
 2014-09-03 17:14:19 -07:00
Tibor Vass
7dcf943afc fix race in daemon test framework 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: defe01daf87237e42a9275a0b286b0f71c60de25
Component: engine
 2014-09-03 17:14:19 -07:00
unclejack
c953d01896 Merge pull request #7191 from tiborvass/test-daemon 
Add Daemon restart test along with Daemon utils
Upstream-commit: 6db078dea79633973b77ca5afad924e10340b39f
Component: engine
 2014-09-02 22:40:23 +03:00
Tibor Vass
e9f9032556 Add TestDaemonRestartWithRunningContainersPorts 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: a9971a89ccb0bd8688e7a8ab8058dcbb66d61687
Component: engine
 2014-09-02 12:13:21 -07:00
Tibor Vass
c02ebae1f7 Add Daemon test utils 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 054b921a2c140f9b8250f6c7e12dec9fba23ce0f
Component: engine
 2014-09-02 10:58:36 -07:00
unclejack
9046d6de2c clean up context on build completion & add test 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 18587469789594f7ca26fc942c6d23b971a14dd3
Component: engine
 2014-09-02 17:35:25 +03: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
Michael Crosby
5f3cf0d988 Make nat test less racy and accurate 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 72652c597385980c1bf6adebe4cded760dbf2663
Component: engine
 2014-09-01 16:54:32 -07:00
Michael Crosby
06de394335 Merge pull request #7825 from LK4D4/move_integration_to_cli 
Move integration to cli
Upstream-commit: efc6c9ba2f51a6103a9c982ab15e508e28e64831
Component: engine
 2014-09-01 11:38:57 -07:00
Michael Crosby
94c61e97d5 Merge pull request #7812 from erikh/fix_top 
docker top: fix command when multiple arguments are supplied
Upstream-commit: 388ed88042b54b3e0fff7096c1749f2bfc2c7e40
Component: engine
 2014-09-01 11:31:38 -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
80ace0ef1f Merge pull request #7817 from cnf/fix_cli_top_test_priv 
Fixed error check using the wrong error value
Upstream-commit: c8999dc326c9d722386c88ba6cca219b8029452e
Component: engine
 2014-08-31 19:24:33 +04:00
Frank Rosquin
f0aedfc820 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>
Upstream-commit: d93c95a332b65948cf37a87a84900323657571f0
Component: engine
 2014-08-31 16:35:38 +02:00
Frank Rosquin
3a37023687 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>
Upstream-commit: 82c536aacd30baf110c074de1f83ae3ab2f9588c
Component: engine
 2014-08-31 16:21:53 +02:00
Erik Hollensbe
e16ec47eeb 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)
Upstream-commit: d7dd35bbd6250fcf42f8fe6521a55813e670f805
Component: engine
 2014-08-31 05:53:05 -07:00