beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
9520 commits 14 branches 412 tags 338 MiB
Commit graph

237 commits

Author SHA1 Message Date
Matthew Heon
1476f295ac 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)
 2014-07-17 13:47:33 -04:00
Johan Euphrosine
32740543da api/server/MAINTAINERS: comment proppy (vacation) 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-07-14 10:13:46 -07:00
Adrien Folie
d689a5e1e2 Add tests for rm with stop and kill options 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-07-11 23:26:08 +00:00
Adrien Folie
7810070630 Stop/Kill options for containers removal 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-07-11 23:26:08 +00:00
unclejack
d53db040c8 Merge pull request #6896 from vieux/add_parsing_deamon_side 
Add repo/tag parsing on the daemon for pull and import
 2014-07-12 01:44:32 +03:00
Victor Vieux
00c1668011 Merge pull request #6985 from vieux/fix_api_1.14 
bump api to 1.14 & update docs
 2014-07-11 15:35:25 -07:00
Adrien Folie
680e27d6ec bump api to 1.14 & update docs 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-07-10 03:24:01 +02:00
James Turnbull
aa0eca03e6 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)
 2014-07-09 11:59:06 -04:00
Victor Vieux
714b63d1be 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)
 2014-07-07 23:09:42 +00:00
Guilherme Salgado
627805f5f8 Convert TestGetImagesJSON into several unit tests 
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
 2014-07-07 21:55:26 +02:00
Victor Vieux
578513095c Merge pull request #6850 from leeplay/patch-2 
Update README.md
 2014-07-07 11:50:27 -07:00
Michael Crosby
35b511b6d0 Merge pull request #6702 from mrunalp/dev/helper_fns 
Move setting hostConfig and pulling images into helper functions.
 2014-07-07 11:39:27 -07:00
Michael Crosby
860c664ccb Merge pull request #6508 from mheon/signals 
Increase size of buffer for signal forwarding with --sig-proxy
 2014-07-07 10:45:31 -07:00
Victor Vieux
dd89904ad3 Merge pull request #6847 from SvenDowideit/add-os-and-arch-to-docker-version 
add client OS and arch to docker version
 2014-07-07 10:15:30 -07:00
Victor Vieux
4a20c9b005 Merge pull request #6823 from folieadrien/move_integration_tests 
Convert TestGetImagesByName into unit and integration-cli test
 2014-07-07 10:13:19 -07:00
unclejack
2ffd13bc31 Merge pull request #6573 from mheon/ps_cleanup 
Escape control and nonprintable characters in docker ps
 2014-07-07 18:23:18 +03:00
Sven Dowideit
eceacb8334 add client OS and arch to docker version 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-07-04 21:23:36 +10:00
hyeongkyu.lee
649b50c0b7 Update README.md 
Docker-DCO-1.1-Signed-off-by: Hyeongkyu Lee <hyeongkyu.lee@navercorp.com> (github: leeplay)
 2014-07-04 18:21:13 +09:00
SvenDowideit
b07f193822 Update cli.md and man pages to match current cli 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-07-03 10:22:20 +10:00
James Turnbull
b59754bcb3 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)
 2014-07-03 10:22:09 +10:00
Adrien Folie
f337a52a6e Move TestGetImagesByName 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-07-03 01:39:08 +02:00
Mrunal Patel
2b3959c414 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)
 2014-07-02 16:33:14 -04:00
unclejack
deb57c5144 Merge pull request #6763 from folieadrien/master 
Migrate TestGetImagesHistory into unit and CLI test
 2014-07-02 19:44:21 +03:00
Victor Vieux
e06d533cc2 update docs 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-07-01 21:59:08 +00:00
Alexandr Morozov
1dc0caf9c0 Implement tail for docker logs 
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-07-01 23:44:12 +04:00
Victor Vieux
cdc62c778f Merge pull request #6787 from vieux/pause_commit2 
Pause/freeze containers during commit
 2014-07-01 10:11:18 -07:00
Solomon Hykes
bc33ce0d8f Merge pull request #6366 from proppy/add-proppy-server 
api/MAINTAINERS: add proppy for server/
 2014-06-30 17:44:02 -07:00
Eric Windisch
17d870bed5 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)
 2014-07-01 00:30:21 +00:00
Tibor Vass
36c78c9172 Merge pull request #6742 from vieux/remove_deprecate_syntax 
remove deprecated syntax for docker commit
 2014-06-30 10:41:07 -04:00
Adrien Folie
c2699d8d89 Add missing test for full coverage 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-06-30 09:36:46 +00:00
Sven Dowideit
b4df555d27 Merge pull request #6544 from mheon/sigproxy_docs 
Update --sig-proxy documentation
 2014-06-30 13:16:38 +10:00
Adrien Folie
9a2771eac2 Migrate TestGetImagesHistory into unit and CLI test 
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
 2014-06-30 01:31:16 +02:00
Victor Vieux
a0b2290713 remove deprecated syntax for docker commit 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-06-27 23:09:41 +00:00
Victor Vieux
0098360726 abort on error and fix debug 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-06-26 22:49:08 +00:00
Travis Cline
9189db3aff Add .dockerignore support 
Fixes #2224

Docker-DCO-1.1-Signed-off-by: Travis Cline <travis.cline@gmail.com> (github: tmc)
 2014-06-26 22:49:08 +00:00
Victor Vieux
56a0f49dcc Merge pull request #6640 from ostezer/commands.go-linguistics-1 
docker help -> grammatical correction (pos. adj. apost.)
 2014-06-26 11:59:49 -07:00
O.S. Tezer
714c1bd8ca Anglicanisms: Grammatical correction (pos. adj. apost.) 
Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
 2014-06-26 08:41:58 +01:00
Trent Ogren
3fcb0d880a 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)
 2014-06-26 11:06:45 +10:00
Tibor Vass
5743151118 Merge pull request #6649 from vieux/fix_api_return_codes_start_stop 
return 304 is status isn't modified in start and stop
 2014-06-25 19:10:19 -04:00
Matthew Heon
be4f4599a6 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)
 2014-06-25 09:08:02 -04:00
Tibor Vass
f6d11c8d50 Merge pull request #6216 from gsalgado/convert-integration-tests 
Convert integration/api_test:TestGetEvents into a unit test and a CLI test
 2014-06-24 14:53:10 -04:00
Victor Vieux
53b036032d 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)
 2014-06-24 18:31:56 +00:00
Guilherme Salgado
1c291ccbbe Migrate TestGetEvents into a unit and a CLI test 
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
 2014-06-24 17:43:26 +02:00
Sven Dowideit
f54823bf05 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)
 2014-06-24 12:25:17 +10:00
Victor Vieux
6a762e8594 Merge pull request #6620 from vieux/deprecate_tag_args 
Remove old tag format
 2014-06-23 17:24:20 -07:00
Johan Euphrosine
edcb41451a api/client/build: allow tar as context for docker build - 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-06-23 13:34:09 -07:00
Victor Vieux
8228d0e2bb Remove old tag format 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-06-23 17:52:03 +00:00
unclejack
a5f5d5e8d7 Merge pull request #6571 from vbatts/vbatts-raw_json 
raw json for `docker save`
 2014-06-20 23:55:10 +03:00
Michael Crosby
8ee1f2a9e9 Merge pull request #6516 from LK4D4/validate_logs_params 
Validate that one of streams choosen in logs on api side
 2014-06-20 13:43:31 -07:00
Matthew Heon
f55fa8211b 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)
 2014-06-20 12:22:31 -04:00