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

3688 commits

Author SHA1 Message Date
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
unclejack
bde192bb80 Merge pull request #4078 from vieux/rewrite_rmi 
Rewrite docker rmi
 2014-02-26 21:30:24 +02:00
unclejack
31ddc16692 Merge pull request #4292 from cpuguy83/4291_make_rm_default_for_build 
make docker build -rm=true default
 2014-02-26 19:03:59 +02:00
Brian Goff
0b4aeb79d9 make docker build -rm=true default #4292 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
 2014-02-26 11:04:06 -05:00
unclejack
b8a8c0c686 Merge pull request #4342 from vieux/update_maintainers_api 
update api Maintainers file
 2014-02-26 16:33:02 +02:00
Victor Vieux
2f468a498a update api Maintainers file 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 23:19:44 +00:00
Victor Vieux
386e7c80c0 fix content-type docker copy 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 22:49:19 +00:00
Victor Vieux
8dad771daa add version pkg 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:38 +00:00
Victor Vieux
964d82d005 fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:08 +00:00
Victor Vieux
c7f825c0f0 := / var 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:08 +00:00
Victor Vieux
e7cc88c39f bump API version 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:07 +00:00
Victor Vieux
795ed6b1e5 Rewrite docker rmi 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-25 21:08:07 +00:00
Tianon Gravi
7bce5957a0 Convert api/server.go to also use the handy user package 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-02-25 13:07:19 -07:00
Victor Vieux
4434b63ff4 fix gofmt 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-24 23:10:45 +00:00
Solomon Hykes
551355c9ad api/common.go: code shared by the server and client implementation of the Docker remote api. 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-24 11:54:50 -08:00
Solomon Hykes
919665a20a Register built-in engine commands at runtime instead of compile-time 
This allows selective loading of commands, and paves the way to dynamic
plugins.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-24 19:24:29 +00:00
jakedt
7dcbae485c Fix build command auth by adding the auth config and registry objects to the build job environment. 
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com> (github: jakedt)
 2014-02-20 19:22:13 -05:00
Jake Moshenko
90b0cce07b Fix registry auth by storing the string passed on the command line, and allowing for credential selection by normalizing on hostname. Also, remove remote ping calls from CmdPush and CmdPull. 
Docker-DCO-1.1-Signed-off-by: Jake Moshenko <jake@devtable.com> (github: jakedt)
 2014-02-20 18:32:33 -05:00
Sven Dowideit
940c381dd5 my attempt to disentagle repository and registry (Issue #1439) 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
 2014-02-18 20:16:08 +10:00
Victor Vieux
4187f4e750 Merge pull request #4168 from crosbymichael/add-listenbuffer 
Hold connections until the daemon has fully loaded
 2014-02-17 16:04:49 -08:00
Michael Crosby
e23190b6b3 Improve error message only if no body is returned 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-17 15:29:52 -08:00
Michael Crosby
d55cc64c4e Revert "Merge pull request #4151 from crosbymichael/improve-404-client-message" 
This reverts commit 6dd1bb9eb0, reversing
changes made to 23aec9d7fc.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-17 15:25:00 -08:00
Michael Crosby
e743021193 Move job register into servapi 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-17 15:10:51 -08:00
Victor Vieux
382659e03a Merge pull request #4113 from SvenDowideit/build-quiet-help 
add a little reenforcement to the help for docker build -q
 2014-02-17 10:38:43 -08:00
Sven Dowideit
797b7d3446 add a little reenforcement to the help for docker build -q 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-02-17 11:35:55 +10:00
Fabio Falci
a51441278a docker cp error when container doesn't exist 
Fix cp api to return a 404 notfound if container doesn't exist.
Fixes #4119.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
 2014-02-16 15:49:36 +00:00
Michael Crosby
d5e41c1cb6 Change name to listenbuffer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-15 21:10:37 -08:00
Michael Crosby
778f1bf663 Integration generic socket wait for docker api 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-15 20:49:50 -08:00
Michael Crosby
64716a21e4 Use socket activation pkg for listeners 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-02-15 20:24:55 -08:00
Solomon Hykes
44e10433c7 api/container.go: an API-specific representation of a container 
This breaks the dependency from the remote API implementation to the
internal representation of a container. Instead it uses its own partial
representation of a container, with only required fields.

* This preserves reverse-compatibility with all past implementations of the remote API.

* This clarifies which fields are guaranteed to be present in a response
	A docker remote api server *may* return more fields in a Container
	object, but their presence and semantics are not guaranteed and should
	not be relied upon by client implementations.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-15 23:24:51 +00:00
Solomon Hykes
567a422a65 Remove duplicate function displayablePorts 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-15 14:55:57 -08:00
Solomon Hykes
ee59ba969f Move remote api client to api/ 
This moves `commands.go` out of the core and into `api/client.go`

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-15 14:55:51 -08:00
Michael Crosby
968f4800b5 Merge pull request #4128 from vieux/fix_header_content-type_api 
Fix header content type api
 2014-02-13 20:29:09 -05:00
Victor Vieux
0b403b3531 fix content-type for legacy 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-13 19:24:40 +00:00
Victor Vieux
4611a6bdd3 fix content-type for job.Stdout.Add 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-13 19:21:27 +00:00
unclejack
31dde3ea05 disallow tcp:// from defaulting to 127.0.0.1:4243 
This stops docker from accepting tcp:// as a valid bind address.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
 2014-02-13 13:54:37 +02:00
Solomon Hykes
e08a1c53aa Move api-specific code to the api package 
This facilitates the refactoring of commands.go.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
 2014-02-11 19:59:52 -08:00
Victor Vieux
5d29749e9d fix --run in docker commit 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-10 23:52:15 +00:00
Guillaume J. Charmes
d5d948a038
Add json content type to /containers/json api endpoint 
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
 2014-02-06 09:28:30 -08:00
Darren Shepherd
55e5e37c4f Fix broken images API for version <1.7 
Simple typo, "ID" should be "Id".  This is causing the images response
to not have IDs in it.

Docker-DCO-1.1-Signed-off-by: Darren Shepherd <darren.s.shepherd@gmail.com> (github: ibuildthecloud)
 2014-02-05 19:09:55 -07:00
Victor Vieux
e43236c78a fix api with old version 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-02-01 01:24:39 +00:00
Victor Vieux
9eea7f28f0 Move serveapi to api/api.go 
Remove api import from server.go
Rename initapi to init server

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-31 23:06:00 +00:00
Victor Vieux
f556cd4186 move api to it's own package 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
 2014-01-29 19:26:54 +00:00