Commit Graph

73 Commits

Author SHA1 Message Date
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
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