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

92 commits

Author SHA1 Message Date
Victor Vieux
5506e4b62d Merge pull request #4840 from vbatts/vbatts-load_from_input 
docker load: add --input flag
 2014-03-25 14:37:27 -07:00
Vincent Batts
84e1fdf35d docker load: add --input flag 
for those that do not care to read from redirected stdin

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-03-24 21:43:26 -04:00
Michael Crosby
4585d2da3e Merge pull request #4751 from enokd/master 
Fixes #3369 Repeated slash-'/' characters; harmonize across all name-related commands
 2014-03-24 17:43:02 -07:00
Michael Crosby
a258d048a2 Merge pull request #4778 from vbatts/vbatts-save_to_output 
`docker save --output` flags
 2014-03-24 16:52:08 -07:00
Michael Crosby
d503714285 Revert "Disable automatic killing of containers when docker stop fails" 
This reverts commit 8b5cf51d60.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-24 12:03:56 +00:00
Djibril Koné
43c3ee3ba1 Harmonize / across all name-related commands/Validate images names 
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com> (github: enokd)
 2014-03-21 00:40:58 +01:00
Djibril Koné
e38e977a04 Harmonize / across all name-related commands 
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com> (github: enokd)

Harmonize / across all name-related commands

Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com> (github: enokd)

Harmonize / across all name-related commands:Return an error when repeated /

Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com> (github: enokd)
 2014-03-20 00:45:29 +01:00
Victor Vieux
12687b7c10 Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-19 22:03:11 +00:00
Vincent Batts
78a0105eaf api/client: var style tweak 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-03-19 17:09:12 -04:00
Vincent Batts
e93a16ab48 docker save: add and improve docs 
add usage examples for `docker save ...`

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-03-19 14:47:20 -04:00
Vincent Batts
5127732c79 docker save: --output flag 
for those that do not care to redirect stdout

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
 2014-03-19 14:31:22 -04:00
LK4D4
c1f2abd899 Using names in docker ps --since-id/--before-id, resolves #3565 
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-03-18 23:30:21 +04:00
Guillaume J. Charmes
bfbf338f51 Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop 
Disable automatic killing of containers when docker stop fails
 2014-03-18 11:28:42 -07:00
Guillaume J. Charmes
68dc189680 Merge pull request #4661 from vieux/add_no_prune 
Add no prune
 2014-03-17 16:07:55 -07:00
unclejack
fb503da34e Merge pull request #4710 from jimenez/4680-timeout_flag-fix 
Disable timeout
 2014-03-18 00:38:39 +02:00
Isabel Jimenez
25218f9b23 adding configuration for timeout and disable it by default 
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com> (github: jimenez)
 2014-03-17 15:12:02 -07:00
Brian Goff
8b5cf51d60 Disable automatic killing of containers when docker stop fails 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-03-17 15:15:44 -04:00
Victor Vieux
edd8d2d351 add no prune to rmi 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-17 18:40:57 +00:00
unclejack
2ada6441db Merge pull request #4701 from erikh/4099-non_existent_file_no_error 
Fix `docker cp` trying to untar files that do not exist.
 2014-03-17 20:38:26 +02:00
Guillaume J. Charmes
f9bd6c860d Merge pull request #4364 from vieux/move_clone 
move git clone from daemon to client
 2014-03-17 11:36:56 -07:00
Guillaume J. Charmes
d810218038 Merge pull request #4720 from vieux/fix_content-type_cp 
fix content-type detection in docker cp
 2014-03-17 11:24:18 -07:00
Victor Vieux
90b283c39a fix content-type detection in docker cp 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-17 17:56:21 +00:00
Erik Hollensbe
9e69a042c5 Fix docker cp trying to untar files that do not exist. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org> (github: erikh)
 2014-03-16 17:48:46 +00:00
Erik Hollensbe
e32965dbb1 In docker ps, sort by port instead of unsorted. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org> (github: erikh)
 2014-03-16 16:28:44 +00:00
Victor Vieux
c349c9d14a create the cli obj before calling parseCommand 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-14 00:47:13 +00:00
Victor Vieux
9c21a73f74 Merge pull request #4659 from creack/more_info 
Have the exec driver and kernel version in non-debug mode in `docker info`
 2014-03-13 17:32:42 -07:00
Guillaume J. Charmes
6411ee6d24
Have the exec driver and kernel version in non-debug mode in docker info 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-13 16:28:16 -07:00
Tianon Gravi
44fe8cbbd1 Update to double-dash everywhere 
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-03-13 11:46:02 -06:00
Victor Vieux
bd1c512594 Merge pull request #4621 from unclejack/fix_empty_cidfile 
don't leave empty CIDFile behind
 2014-03-12 11:12:51 -07:00
unclejack
a56d1b93a1 don't leave empty cidFile behind 
This makes `--cidfile` clean up empty container ID files. These are
left behind when creating the container fails.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-03-12 19:36:19 +02:00
Guillaume J. Charmes
95e5910ab2
Fix attach exit on darwin 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-11 17:51:29 -07:00
Victor Vieux
3715f46b8b Merge pull request #4491 from crosbymichael/add-pull-dep 
Add deprecation warning for -t on pull
 2014-03-11 10:22:06 -07:00
Michael Crosby
15e52ccaad Add deprecation warning for -t on pull 
Closes #3410
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-11 10:11:05 -07:00
Victor Vieux
0d6275b298 if client has no git, use server 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-03-11 01:23:14 +00:00
Victor Vieux
8301fc8e56 move git clone from daemon to client 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)

add a little doc
 2014-03-11 01:23:14 +00:00
Michael Crosby
b5a544b02e Merge pull request #4563 from creack/signal-improvment 
Signal improvments
 2014-03-10 17:59:17 -07:00
Guillaume J. Charmes
157f24ca77 Make docker use the signal pkg with strings 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-10 17:36:47 -07:00
Guillaume J. Charmes
c563262239 Move signal to pkg 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-10 17:36:32 -07:00
Guillaume J. Charmes
8d88ea0c15
Merge auth package within registry 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
 2014-03-10 17:16:58 -07:00
Johannes 'fish' Ziemke
c000cb6471 Add authenticated TLS support for API 
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
 2014-03-09 00:06:44 +01:00
unclejack
e388b6aba5 Merge pull request #3959 from cpuguy83/3958_add_ability_to_remove_running_container_in_single_command 
Add ability to force removal of running container via docker rm -f
 2014-03-07 00:05:57 +02:00
Evan Krall
644acec2f7 Create a -G option that specifies the group which unix sockets belong to. 
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com> (github: EvanKrall)
 2014-03-06 11:17:04 -08:00
Victor Vieux
9101686161 Merge pull request #4462 from jamtur01/langfix 
Updated a variety of language and error messages
 2014-03-05 10:22:51 -08:00
James Turnbull
9cbf22dee2 Updated a variety of language and error messages 
In api/client.go updated:

1. Made api == API
2. Restated Docker daemon connection error to be clearer.
3. Changed use of "Impossible" in error messages.
4. Removed extra space in restart error message.
5. Fixed capitalization in three error messages.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-03-04 20:52:48 -05:00
James Turnbull
725c7cd08a Made CLI option capitalization consistent in api/client.go 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-03-04 20:45:22 -05:00
Guillaume J. Charmes
0eeb146398 Merge pull request #4270 from DevTable/fixregistryauth 
Fix registry auth and remove other hidden ping commands from client code
 2014-03-03 17:34:21 -08:00
Victor Vieux
37d0ce42c6 Merge pull request #4385 from khia/json_format 
Support json output in --format flag of docker inspect
 2014-03-03 12:36:47 -08:00
Brandon Philips
8d2226b7e5 fix(api): serve until the "acceptconnections" job 
This fixes a bug that I encountered when using socket activation with
docker 0.8.1. When running the first `docker run` it would return:
"create: command not found".

The root cause was the socket activation code path was starting to
listen before the "initserver" job had finished. This meant that the
"create" handler hand't been registered yet leading to the command not
found error.

In log format it looks like this:

```
[/var/lib/docker|9d2e78e9] +job initserver()
2014/03/01 04:05:35 Listening for HTTP on fd ()
[/var/lib/docker|0d71c177] +job create()
create: command not found
[/var/lib/docker|0d71c177] -job create()
[/var/lib/docker|0d71c177] +job acceptconnections()
[/var/lib/docker|0d71c177] -job initserver() = OK (0)
```

To fix the issue select on the activationLock and block until the
"acceptconnections" job has ran.

Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
 2014-03-01 10:55:36 -08:00
ILYA Khlopotov
e07920f680 Support json output in --format flag of docker inspect 
Docker-DCO-1.1-Signed-off-by: ILYA Khlopotov <ilya.khlopotov@gmail.com> (github: khia)
 2014-02-28 17:34:31 -08:00
Brian Goff
d78fcb32ff Add ability to force removal of running container via docker rm -f 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-02-27 23:31:36 -05:00