p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,944 Commits 2 Branches 295 Tags
811bdfdcea708eb0661899d64b24bc052576c8b7
Commit Graph

220 Commits

Author SHA1 Message Date
Michael Crosby
722d8e53b5 Merge pull request #7374 from cpuguy83/revert_rm_f_deprecation 
Revert --stop/--kill and use SIGKILL instead
Upstream-commit: 414ccee23a25df258f9496e721dbfb6f1773ea9a
Component: engine
 2014-08-07 16:47:25 -07:00
unclejack
081e88cd1a Merge pull request #7304 from unclejack/refactor_build_tests 
integration cli: minor refactor of the build tests
Upstream-commit: b36f6308176ccb44d93704388514fa0041a8584e
Component: engine
 2014-08-08 01:24:51 +03:00
Brian Goff
a79d7ec92b 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)
Upstream-commit: 95f86da641dfec9b3db88e0f0a8457685361a871
Component: engine
 2014-08-07 18:20:43 -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
Tibor Vass
9075da38d2 Move some integration tests to integration-cli 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 69f9d488dc915d8b02827658ccc5a7c48136dc03
Component: engine
 2014-08-06 17:18:51 -04:00
Tibor Vass
ddc4e78a18 Fix TestBuildForbiddenContextPath after TMPDIR change 
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 5e20b0027c19efdd83228cbbb9995847cb5cb8ed
Component: engine
 2014-08-06 14:24:00 -04: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
LK4D4
3ee2b7b6cb Cleanup Cmd on ENTRYPOINT instruction 
Fixes #5147
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1b6546b8407ce0fa41340efefc081beadf26d41c
Component: engine
 2014-08-04 20:48:36 +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
Michael Crosby
85222943a2 Merge pull request #7312 from tianon/update-libcontainer 
Bump libcontainer dep
Upstream-commit: b1496effe37ef6161faf0b4e987f4261329c0a66
Component: engine
 2014-07-31 15:20:07 -07:00
Bruno Renié
604012d742 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)
Upstream-commit: 27cca4c70cc7f0cccfda693ca7bbb2422eec3e13
Component: engine
 2014-07-31 15:10:56 -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
unclejack
93bee1a9de integcli: use dockerCmdInDir in build tests 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 372f9bb58b820b85ed1975ea713958b684c17e94
Component: engine
 2014-07-29 16:01:56 +03:00
unclejack
cc850d8d72 integcli: add some more docker utils 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: f60c8e9e6154629de8eaa19bfa0f52b2be4791e5
Component: engine
 2014-07-29 15:56:41 +03:00
Erik Hollensbe
39b46f69f1 fix docker integration-cli restart test race 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 5931669343f568114cb209dabf8913be44cd63e8
Component: engine
 2014-07-28 23:46:14 -07:00
Tibor Vass
93d0b8352d Merge pull request #7140 from proppy/more-addtar-tests 
integration-cli: add more tests for BuildAddTar
Upstream-commit: 030676444ade28ded0953ff179d65fe99bbf4fed
Component: engine
 2014-07-28 11:58:29 -04:00
Tibor Vass
3fc02efa64 Merge pull request #7209 from LK4D4/test_build_from_git 
Test on building from GIT url
Upstream-commit: da40d9b7a50704b0ff28f885dc4e87ffb77cd01b
Component: engine
 2014-07-28 11:15:50 -04:00
unclejack
4eed6ed770 Merge pull request #7097 from LK4D4/fix_eof_dockerignore_#7093 
Skip whole dir dockerignoring with warning
Upstream-commit: 7978b3212789203ffe75af60792d85132fb1c519
Component: engine
 2014-07-28 17:34:44 +03:00
Tibor Vass
f70f5a32c7 address a few nits 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: d082381a93810e6c386382f24da93518880e9250
Component: engine
 2014-07-25 18:29:47 -04: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
Alexandr Morozov
51f29305ff 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)
Upstream-commit: 5b0d4cf29629eabb8855400159c097cbd7502922
Component: engine
 2014-07-24 11:19:16 +04:00
unclejack
c8bd24665b integcli: fix TestInspectLinksStopped with Go1.3 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: d0cbc54f234b01585670e19b49a8c931b2719472
Component: engine
 2014-07-23 01:15:29 +03:00
Johan Euphrosine
07d7985c4e integration-cli/TestBuildAddTar: embed Dockerfile 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 5d8e80ba8da808fb70d529711359e2d826db2407
Component: engine
 2014-07-21 15:02:31 -07:00
Johan Euphrosine
c5f83694a2 integration-cli/TestBuildAddTar: generate context from test 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 24c00c8508b33de4229280f0be2e7b5761d6ed0e
Component: engine
 2014-07-21 13:03:00 -07:00
Johan Euphrosine
41d8a0c6c0 integration-cli: add more tests for BuildAddTar 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 30519330c723374526e7dbfc14807cc8da86c2c0
Component: engine
 2014-07-21 11:56:49 -07:00
LK4D4
d628315a52 Move TestCopyVolumeContent to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: e88487b321fba4d1a6d9dcd080ec5b9ae024865e
Component: engine
 2014-07-19 12:42:27 +04:00
LK4D4
c0a07344c1 Move TestCopyVolumeUidGid to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 9a7c5be7d1d71d339b857ec20ca03cc09d4bbfa2
Component: engine
 2014-07-19 12:42:27 +04:00
Tibor Vass
45fa986bbf Merge pull request #6913 from unclejack/map_randomization_fixes 
integcli: fix failures caused by tiny map randomization
Upstream-commit: ac6ec9df1da4467304e4b48bcc7f77385e36a515
Component: engine
 2014-07-19 00:27:37 -05:00
Victor Vieux
ebae204c95 Merge pull request #7098 from fabiofalci/move_ps_tests_to_cli 
Move `docker ps` test to integration cli
Upstream-commit: e52382292f9373e73b538d7f26e5ca8efc0884b1
Component: engine
 2014-07-18 14:29:40 -07:00
Alexandr Morozov
ee8e73d083 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)
Upstream-commit: 4162309d116fe5cb171d7d212842fe5406c544df
Component: engine
 2014-07-18 21:51:55 +04:00
Fabio Falci
0085f61a68 Move docker ps test to integration cli 
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 261dc5e2f60d8c47c36e719db0ecebd77258847e
Component: engine
 2014-07-18 09:43:40 +01:00
Alexandr Morozov
fb5c0827a3 Skip whole dir dockerignoring with warning 
Fixes #7093
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 7d97a5f4760da388c22a5a29ed95888b89a23d57
Component: engine
 2014-07-18 09:35:54 +04:00
Victor Vieux
b18fd72d71 Merge pull request #7083 from mheon/6983_bugfix 
Fix Panic with -t and -a stderr
Upstream-commit: 5948b105e7dcc7428e9525ccb44d543169b47a6e
Component: engine
 2014-07-17 18:41:24 -07:00
unclejack
e55262927d integcli: fix map randomization failures 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 68bb56a4a5a5905a7f5eb0781782e1db5cfc7a89
Component: engine
 2014-07-17 23:11:45 +03:00
unclejack
e695b55f9e integcli: add JSON utils for testing 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: e5e8669c7289959a2634bd3f66f89eef1bd4ef01
Component: engine
 2014-07-17 23:11:40 +03:00
Matthew Heon
e650e69f7d 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)
Upstream-commit: 1476f295aca20e1c35383c133219d54a5373183f
Component: engine
 2014-07-17 13:47:33 -04:00
unclejack
697ca2953b 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)
Upstream-commit: be8cea98560f4e63ff367a632539bf9f6bf929a4
Component: engine
 2014-07-17 00:32:24 +03:00
Michael Crosby
5a03c34f92 Allow case insensitive caps for add and drop 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 7c19499c635358719c5a9c9fb1cb66a5fcf12718
Component: engine
 2014-07-16 11:47:55 -07:00
Victor Vieux
e7f2c9317d add check for invalid caps 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: c04230c42b7a953ffe50bc37d351f86e80a442e6
Component: engine
 2014-07-11 23:43:21 +00:00
Victor Vieux
5201bb5120 support add and drop in both order 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 064b5f870db39e33f18d6dd405f2bdab98255ef7
Component: engine
 2014-07-11 23:43:21 +00:00
Victor Vieux
669e2fe479 add basic support for 'all' 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 222a6f44016451dcbd2da0003e64521c06e88ba9
Component: engine
 2014-07-11 23:43:21 +00:00
Victor Vieux
986cb2347f fix job and add tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 8344b6d7368b90c567f43e0c17d4495e2e7b12f5
Component: engine
 2014-07-11 23:43:21 +00:00
Adrien Folie
3853ef9c11 Add tests for rm with stop and kill options 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: d689a5e1e2633b5fd0db4ccccfb4969e03ae256b
Component: engine
 2014-07-11 23:26:08 +00:00
Timothy
c15db86f61 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)
Upstream-commit: e855c4b92170534864b920ec1e267b3a815764f9
Component: engine
 2014-07-10 10:35:53 -07:00
Victor Vieux
42b9849b1f Merge pull request #6931 from tiborvass/merge-5723 
Updated docker logs timestamp to RFC3339 (carrying #5723)
Upstream-commit: 519319b989b7434435d95033f6a7ea9f32d141ec
Component: engine
 2014-07-09 14:23:23 -07:00
James Turnbull
34b700c7bf 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)
Upstream-commit: aa0eca03e6662c5f6b4f0f47190a45f49b61e357
Component: engine
 2014-07-09 11:59:06 -04:00
Alexandr Morozov
2199b246f3 Simple additions to TestBuildAddTar 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: fc2631b499ba27350f20e7466f54cb06b5c65079
Component: engine
 2014-07-09 13:41:57 +04:00