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

237 Commits

Author SHA1 Message Date
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
Johan Euphrosine
bd79f253bc api/server/MAINTAINERS: comment proppy (vacation) 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 32740543daf889388662a963d8a61b1096e75693
Component: engine
 2014-07-14 10:13:46 -07: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
Adrien Folie
ceab494147 Stop/Kill options for containers removal 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 78100706303efdf9a3deee0239a7dbb3a93837ec
Component: engine
 2014-07-11 23:26:08 +00:00
unclejack
067d7ed315 Merge pull request #6896 from vieux/add_parsing_deamon_side 
Add repo/tag parsing on the daemon for pull and import
Upstream-commit: d53db040c867403e76915459eafbb5d7fd1d2887
Component: engine
 2014-07-12 01:44:32 +03:00
Victor Vieux
c1e9ed3e53 Merge pull request #6985 from vieux/fix_api_1.14 
bump api to 1.14 & update docs 
Upstream-commit: 00c1668011d26245e73f9faeb5d461a925948b71
Component: engine
 2014-07-11 15:35:25 -07:00
Adrien Folie
952492cc20 bump api to 1.14 & update docs 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 680e27d6ec7662462594fd5264a00c09bcb14da4
Component: engine
 2014-07-10 03:24:01 +02: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
Victor Vieux
0544edc315 Add repo/tag parsing on the daemon for pull and import 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 714b63d1be55f468f0cb6b06c88924a941110175
Component: engine
 2014-07-07 23:09:42 +00:00
Guilherme Salgado
f220709916 Convert TestGetImagesJSON into several unit tests 
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
Upstream-commit: 627805f5f8895c3a3887c312f7b8f49a89e51732
Component: engine
 2014-07-07 21:55:26 +02:00
Victor Vieux
1270978241 Merge pull request #6850 from leeplay/patch-2 
Update README.md
Upstream-commit: 578513095c1f69227d7942d167fc41b6598d95ac
Component: engine
 2014-07-07 11:50:27 -07:00
Michael Crosby
df92ffe131 Merge pull request #6702 from mrunalp/dev/helper_fns 
Move setting hostConfig and pulling images into helper functions.
Upstream-commit: 35b511b6d092c80b206c63df7bcbf372cf96bdf3
Component: engine
 2014-07-07 11:39:27 -07:00
Michael Crosby
111401852c Merge pull request #6508 from mheon/signals 
Increase size of buffer for signal forwarding with --sig-proxy
Upstream-commit: 860c664ccbe1fd680be3952034126d82ce73a064
Component: engine
 2014-07-07 10:45:31 -07:00
Victor Vieux
35129fcf06 Merge pull request #6847 from SvenDowideit/add-os-and-arch-to-docker-version 
add client OS and arch to docker version
Upstream-commit: dd89904ad3ad8147fb046db0e5fef9f6379f9a39
Component: engine
 2014-07-07 10:15:30 -07:00
Victor Vieux
d1bf2949a1 Merge pull request #6823 from folieadrien/move_integration_tests 
Convert TestGetImagesByName into unit and integration-cli test
Upstream-commit: 4a20c9b005362ffdaa6b1b71adab1063191cf9f5
Component: engine
 2014-07-07 10:13:19 -07:00
unclejack
4f072fe2fa Merge pull request #6573 from mheon/ps_cleanup 
Escape control and nonprintable characters in docker ps
Upstream-commit: 2ffd13bc3159ef3a1f97d9a59cfe7704264c2db1
Component: engine
 2014-07-07 18:23:18 +03:00
Sven Dowideit
bb9d32707c add client OS and arch to docker version 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: eceacb8334250b9f241b263f28372d5f35ada71d
Component: engine
 2014-07-04 21:23:36 +10:00
hyeongkyu.lee
7f05b13374 Update README.md 
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
Upstream-commit: 649b50c0b71a21f8ea6b88c63008a0f909fe4113
Component: engine
 2014-07-04 18:21:13 +09:00
SvenDowideit
bedc0093af Update cli.md and man pages to match current cli 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: b07f193822d00e40580cd11320ed7e01b629f9d7
Component: engine
 2014-07-03 10:22:20 +10:00
James Turnbull
7c1601352b Fixed numerous inconsistencies in command help text 
* Replaced docker with Docker.
* Consistently used STDIN, STDOUT, STDERR.
* Consistently used TTY.
* Fixed some grammar and spelling issues.
* Fixed references to the index.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: SvenDowideit)
Upstream-commit: b59754bcb32fe5b8f416f407f71d2b50bb148c8a
Component: engine
 2014-07-03 10:22:09 +10: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
Mrunal Patel
c4b0fae952 api.DockerCli: Extract pullImage into separate function 
This lets us reuse this code later.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 2b3959c414ffe9403e53617ed1a160c1daabeeaa
Component: engine
 2014-07-02 16:33:14 -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
Victor Vieux
fe06e048c4 update docs 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: e06d533cc20c6aab10bf28a610445e7de6a8ef42
Component: engine
 2014-07-01 21:59:08 +00: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
e49c262737 Merge pull request #6787 from vieux/pause_commit2 
Pause/freeze containers during commit
Upstream-commit: cdc62c778f86070d2d62de5055d6288b916136ee
Component: engine
 2014-07-01 10:11:18 -07:00
Solomon Hykes
4dbce92b61 Merge pull request #6366 from proppy/add-proppy-server 
api/MAINTAINERS: add proppy for server/
Upstream-commit: bc33ce0d8f8b3c3b3e80fbd4084f8a8e74130c0c
Component: engine
 2014-06-30 17:44:02 -07: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
Tibor Vass
795e9b6d57 Merge pull request #6742 from vieux/remove_deprecate_syntax 
remove deprecated syntax for docker commit
Upstream-commit: 36c78c917240312e5521eccb195ccce31b29d0f8
Component: engine
 2014-06-30 10:41:07 -04:00
Adrien Folie
772cf3bd50 Add missing test for full coverage 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: c2699d8d896d592dc02276d76dfdf544fd26d0dd
Component: engine
 2014-06-30 09:36:46 +00:00
Sven Dowideit
866640533b Merge pull request #6544 from mheon/sigproxy_docs 
Update --sig-proxy documentation
Upstream-commit: b4df555d27603621eacbcabb19d1db52bc370c86
Component: engine
 2014-06-30 13:16:38 +10: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
Victor Vieux
4d2725fe4d remove deprecated syntax for docker commit 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: a0b229071394e6534808f16c4570ed8fd9ff3a1c
Component: engine
 2014-06-27 23:09:41 +00:00
Victor Vieux
47f54ad882 abort on error and fix debug 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 0098360726e3df99e8f76dce9221a85dd89c2065
Component: engine
 2014-06-26 22:49:08 +00: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
Victor Vieux
10316c12ae Merge pull request #6640 from ostezer/commands.go-linguistics-1 
docker help -> grammatical correction (pos. adj. apost.)
Upstream-commit: 56a0f49dcc3ef134abc9a05723c961233f6242b0
Component: engine
 2014-06-26 11:59:49 -07:00
O.S. Tezer
befb61a0bc Anglicanisms: Grammatical correction (pos. adj. apost.) 
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
Upstream-commit: 714c1bd8ca49c6fc5e7939d6a7abf6a54d56b06a
Component: engine
 2014-06-26 08:41:58 +01:00
Trent Ogren
c384cf54c2 Add missing parenthesis in docs for -author switch 
Docker-DCO-1.1-Signed-off-by: Trent Ogren <tedwardo2@gmail.com> (github: misfo)

Docker-DCO-1.1-Signed-off-by: Trent Ogren <tedwardo2@gmail.com> (github: SvenDowideit)
Upstream-commit: 3fcb0d880aad65690cac304c30f72d0688a801d2
Component: engine
 2014-06-26 11:06:45 +10:00
Tibor Vass
f6a0457a3f Merge pull request #6649 from vieux/fix_api_return_codes_start_stop 
return 304 is status isn't modified in start and stop
Upstream-commit: 5743151118d5b6965f573743ecaddf72792df034
Component: engine
 2014-06-25 19:10:19 -04:00
Matthew Heon
a8f5e76a89 Update documentation noting that SIGCHLD is not proxied. 
Docker's --sig-proxy option sends all signals but one to a container. The
exception s SIGCHLD, which is deliberately ignored as it doesn't make sense to
send such a signal to a process in a container. Documentation updates will make
this less confusing if anyone does attempt to do this.

Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: be4f4599a6d2a517e615dc1f64527a3f2ad2f683
Component: engine
 2014-06-25 09:08:02 -04:00
Tibor Vass
126ec1c58c Merge pull request #6216 from gsalgado/convert-integration-tests 
Convert integration/api_test:TestGetEvents into a unit test and a CLI test
Upstream-commit: f6d11c8d50387472fd7e34eea66b79237238c321
Component: engine
 2014-06-24 14:53:10 -04:00
Victor Vieux
986327e6e1 return 304 is status isn't modified in start and stop 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 53b036032d783c0a05362ef5722e2c55af503bb1
Component: engine
 2014-06-24 18:31:56 +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
Sven Dowideit
90c80009e3 Add Sockets (-H) list to docker -D info. 
This will allow us to _know_ what the user's -H settings are, which may
be useful for debugging later.

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: f54823bf05af1d549aee4f0d1f56f9a8995eb268
Component: engine
 2014-06-24 12:25:17 +10:00
Victor Vieux
2e2569f2c6 Merge pull request #6620 from vieux/deprecate_tag_args 
Remove old tag format
Upstream-commit: 6a762e859494eb73cbd92a41d5268a523996aa41
Component: engine
 2014-06-23 17:24:20 -07:00
Johan Euphrosine
794a8c5ccb api/client/build: allow tar as context for docker build - 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: edcb41451aa388abe03d4f837ab5ee316a53a030
Component: engine
 2014-06-23 13:34:09 -07:00
Victor Vieux
82240e2b85 Remove old tag format 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 8228d0e2bbd3a42755a84e11455b51a5caf61a94
Component: engine
 2014-06-23 17:52:03 +00:00
unclejack
929a82a086 Merge pull request #6571 from vbatts/vbatts-raw_json 
raw json for `docker save`
Upstream-commit: a5f5d5e8d7e3e70c681059f399714f0e7610dff6
Component: engine
 2014-06-20 23:55:10 +03:00
Michael Crosby
23fd1b998a Merge pull request #6516 from LK4D4/validate_logs_params 
Validate that one of streams choosen in logs on api side
Upstream-commit: 8ee1f2a9e9dc1ef025b1551f1f5b676116c83cfa
Component: engine
 2014-06-20 13:43:31 -07:00
Matthew Heon
3ee2658a4c Escape control and nonprintable characters in docker ps 
The docker ps command displays the user-entered command running in a container.
If that command contained \n, \t, or other control characters, they were
interpreted literally, and newlines and tabs would be printed in the output.
Escape the command string to make things more readable.

Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: f55fa8211b6faf08091dd99ed8e5e3f08ab9cf1f
Component: engine
 2014-06-20 12:22:31 -04:00