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

183 Commits

Author SHA1 Message Date
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
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
Michael Crosby
afb119eb53 Merge pull request #6773 from fabiofalci/restart_tests_to_cli 
Move `docker restart` tests to integration cli
Upstream-commit: f91a97256b5773f889f9e2d7a1be53f90c3d0318
Component: engine
 2014-07-08 17:44:29 -07:00
Sam Rijs
4eb22040d9 avoid regression in events test 
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
Upstream-commit: 560eb07009d65fbcfb49b2fa8b04a2e3f4d647e8
Component: engine
 2014-07-09 00:09:03 +00:00
Sam Reis
bbaf2a8ed6 Add test for event limitation 
Docker-DCO-1.1-Signed-off-by: Samuel Reis <srijs@airpost.net> (github: srijs)
Upstream-commit: 46747963b603a5573a0b26dcef407a96757926e7
Component: engine
 2014-07-09 00:09:03 +00:00
Michael Crosby
a8bb2012bc Merge pull request #6882 from cpuguy83/fix_gh#6856_add_pass_unpause_events 
Add event logs for pause/unpause
Upstream-commit: f0aba1aad4d86c5f4989b40bd27be96d72eab6a2
Component: engine
 2014-07-08 15:31:23 -07:00
Tibor Vass
ff37e700fc Tests for ADD tar 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: cfa4999d695d98f30d942460576d5f9c03a64d92
Component: engine
 2014-07-08 15:34:04 -04:00
Brian Goff
34644f5fc5 Add event logs for pause/unpuase 
Fixes #6856

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: e1ec91fc582f10d57025e39f0f7e7d6695f7454e
Component: engine
 2014-07-08 15:27:44 -04:00
Victor Vieux
75cb3255af Merge pull request #6720 from fabiofalci/relax_dns_search 
Relax dns search to accept empty domain
Upstream-commit: 170609e36957fc044723789bc66918bd7d189702
Component: engine
 2014-07-07 15:12:29 -07:00
Tibor Vass
5a05ec9b94 Merge pull request #6857 from vbatts/vbatts-fix_save_repositories 
docker save: fix the 'repositories' file
Upstream-commit: 52c58b9ea09655fdcd143f94d733a91229dd557c
Component: engine
 2014-07-07 17:26:52 -04:00
Vincent Batts
b15cf92d6a docker save: more integration tests 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 600f65b24786d15a382877da4c3ae77d88e252bb
Component: engine
 2014-07-07 14:58:27 -04:00
Victor Vieux
5a10cf09e4 Merge pull request #6859 from LK4D4/move_buildfile_tests_to_cli 
Moved last build tests to integration-cli
Upstream-commit: 880c98d2d3500a5b694eb4e3a610b6aedf1fa493
Component: engine
 2014-07-07 10:53:26 -07:00
LK4D4
3c88fb5533 Moved last build tests to integration-cli 
Also removed skipped tests on "viz" and "tree" because they
blocked integration/buildfile_test.go removing.

Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1d4862b7a2d0c3b0641ce6d539eabecee686c794
Component: engine
 2014-07-06 15:36:34 +04:00
Fabio Falci
525592aa62 Relax dns search to accept empty domain 
In that case /etc/resolv.conf will be generated with no search
option. Usage: --dns-search=.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 804b00cd7d1f084a872211e5043d255c454c8e51
Component: engine
 2014-07-04 09:33:53 +01:00
Adrien Folie
6b22b2d896 Move TestGetImagesByName 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: f337a52a6ec01684c326a827adbe3d0b8b5f1f53
Component: engine
 2014-07-03 01:39:08 +02:00
Fabio Falci
8ae73ea011 Move docker restart tests to integration cli 
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 9da6c80533f80060575840e1e2fd80cc11826f7b
Component: engine
 2014-07-02 21:56:19 +01:00
Tibor Vass
bc22b11a74 Merge pull request #6780 from unclejack/tweak_cli_integration_tests 
Tweak cli integration tests
Upstream-commit: f357b18ee3550a4214d03c10cfe0bed10d6d0df5
Component: engine
 2014-07-02 13:16:26 -04:00
unclejack
e0255ad153 Merge pull request #6763 from folieadrien/master 
Migrate TestGetImagesHistory into unit and CLI test
Upstream-commit: deb57c5144f75dc6e1e73194c86991264048ca4a
Component: engine
 2014-07-02 19:44:21 +03:00
unclejack
977b717fdd integcli: add & use pullImageIfNotExist for pulls 
This speeds up the tag cli integration tests by about 20 seconds.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: dad476803719ae2e86c703981caef0462e25260c
Component: engine
 2014-07-02 18:45:11 +03:00
Alexandr Morozov
c1f6739a06 Implement tail for docker logs 
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1dc0caf9c0170ab8e7f5a2f77f2dbdacff322eff
Component: engine
 2014-07-01 23:44:12 +04:00
Victor Vieux
afd3ebbfd3 updated docs & tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 957c510d729ac3dcbe892b145fb2d9ed766be2ca
Component: engine
 2014-07-01 17:10:00 +00:00
Eric Windisch
ae1f05d70a Pause/freeze containers during commit 
Initiates a pause before committing a container,
adds a pause option to the commit command, defaulting to 'true'.

Fixes bug: #6267
Fixes bug: #3675

Docker-DCO-1.1-Signed-off-by: Eric Windisch <ewindisch@docker.com> (github: ewindisch)
Upstream-commit: 17d870bed5ef997c30da1e8b9843f4e84202f8d4
Component: engine
 2014-07-01 00:30:21 +00:00
unclejack
8d0912aa9e make TestRemoveContainerRunning handle signals 
This lowers the test execution time by about 5 seconds.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 63e28cc363c5f13288335e811f075e2423375b05
Component: engine
 2014-06-30 22:25:50 +03:00
unclejack
bc5606f61f integration cli: add imageExists to docker utils 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: eb1e8e884d92a7086af96663d0c658d838315490
Component: engine
 2014-06-30 22:22:29 +03:00
Adrien Folie
845fae8efc Migrate TestGetImagesHistory into unit and CLI test 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 9a2771eac22950fce43702896052f5187944de6d
Component: engine
 2014-06-30 01:31:16 +02:00
Michael Crosby
b39625ba3c Merge pull request #6721 from LK4D4/integration_test_on_links 
Integration cli tests on Links in inspect
Upstream-commit: 3aa75210c4decc0affe2f441d302fbbdec1fbc5c
Component: engine
 2014-06-27 13:29:13 -07:00
Alexandr Morozov
91359fcf89 Integration cli tests on Links in inspect 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 08182da5d829762366b9bff9cb27b25a010ad1dd
Component: engine
 2014-06-27 22:44:13 +04:00
unclejack
1e5262e71f integcli: add test to ensure -v /:/ isn't allowed 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 38b005ec69e62d93453ac4013fe6bfa2fccebc5d
Component: engine
 2014-06-27 19:51:24 +03:00
unclejack
0892a09088 Merge pull request #6701 from crosbymichael/mount-root 
Allow / as source of -v
Upstream-commit: 510f1ba4382dfeafaede4cc4ffd6111e9a60bd7d
Component: engine
 2014-06-27 19:03:21 +03:00
Tibor Vass
3090f44756 Merge pull request #6579 from vieux/dockerignore 
Rebased Dockerignore
Upstream-commit: 6e3fe9314801baf9e4d162619fabfca5b61456fa
Component: engine
 2014-06-26 21:00:43 -04:00
Michael Crosby
d3e75544ad Fix sleep command in tests 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 012091a28f8c2a96ad937f8c84992687e804ab71
Component: engine
 2014-06-26 17:09:41 -07:00
Travis Cline
a23ad7fc08 Add .dockerignore support 
Fixes #2224

Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
Upstream-commit: 9189db3aff3e9d72b215b5e204cfac018b2acc5d
Component: engine
 2014-06-26 22:49:08 +00:00
Michael Crosby
cb56a2df49 Allow / as source of -v 
We discussed this at the docker plumbers meetup and for tools and
working on the system for things like boot2docker and coreos this is
needed.  You can already bypass this check so we felt it is ok to start
allowing this feature.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: e39b8eade1f42503b6b7217e72eff4c8fdc13cb6
Component: engine
 2014-06-26 10:50:18 -07:00
Michael Crosby
2437455209 Merge pull request #6646 from tiborvass/fix-workdir 
Fix --workdir=/
Upstream-commit: d91b8bcf0b21f7abf23b06872ad960ebd25e733a
Component: engine
 2014-06-25 15:19:51 -07:00
Erik Hollensbe
4526ee08e7 fix whitespace that precedes the escape in a multiline string. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 03c5c1930d884f0052b4940643fa5b4fc57bdea7
Component: engine
 2014-06-25 13:39:47 -07:00
Tibor Vass
2ab25c0f86 add integration test for --workdir=/ 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: baacc7006b35badb2e9ba807451ab158936d7832
Component: engine
 2014-06-25 11:02:59 -04:00
Tibor Vass
3325b6e290 fix bug in FollowSymlinkInScope when link == root 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 385c9b1a08aeaf7e08363007e5bb79bf30225b7e
Component: engine
 2014-06-25 11:02:59 -04:00
Victor Vieux
d6e6af197e Fix search integration-cli test 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: dd258553b1cbe58d0cb4f8d505aea6f3b1ae6543
Component: engine
 2014-06-24 21:16:34 +00:00
Guilherme Salgado
403b31a70b Migrate TestGetEvents into a unit and a CLI test 
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
Upstream-commit: 1c291ccbbe91b8d8ff3fefb439b20306fd0af2b7
Component: engine
 2014-06-24 17:43:26 +02:00