p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
6,744 Commits 2 Branches 295 Tags
e2cc165aaf54a0e9b10ec00f59dc53bd8f4f32cc
Commit Graph

52 Commits

Author SHA1 Message Date
unclejack
81ffbaf8cc 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
Upstream-commit: e388b6aba5e7d75fecf87223abcd3c1deffd27f0
Component: engine
 2014-03-07 00:05:57 +02:00
Evan Krall
e23e08e833 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)
Upstream-commit: 644acec2f7e3b144a423d0f0a6c900701abdc511
Component: engine
 2014-03-06 11:17:04 -08:00
Victor Vieux
161ea04aaf Merge pull request #4462 from jamtur01/langfix 
Updated a variety of language and error messages
Upstream-commit: 910168616183e815845afc7a64b05eec7737b580
Component: engine
 2014-03-05 10:22:51 -08:00
James Turnbull
dc81426ab3 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)
Upstream-commit: 9cbf22dee26e363bbe3738bbbcd1d70773d80d0d
Component: engine
 2014-03-04 20:52:48 -05:00
James Turnbull
53d25513fd Made CLI option capitalization consistent in api/client.go 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: 725c7cd08af5b895becce19e59fe98cebdc67cf2
Component: engine
 2014-03-04 20:45:22 -05:00
Guillaume J. Charmes
f917ba6a35 Merge pull request #4270 from DevTable/fixregistryauth 
Fix registry auth and remove other hidden ping commands from client code
Upstream-commit: 0eeb146398470bb586ce5b3f1dff28f2f4bbaa4e
Component: engine
 2014-03-03 17:34:21 -08:00
Victor Vieux
085a080854 Merge pull request #4385 from khia/json_format 
Support json output in --format flag of docker inspect
Upstream-commit: 37d0ce42c689d3691824c92db81b9c7c9cd98479
Component: engine
 2014-03-03 12:36:47 -08:00
Brandon Philips
d9902b0a95 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)
Upstream-commit: 8d2226b7e5a5d5334f80d3ec03313fe2cd3210a3
Component: engine
 2014-03-01 10:55:36 -08:00
ILYA Khlopotov
9a5ac39c28 Support json output in --format flag of docker inspect 
Docker-DCO-1.1-Signed-off-by: ILYA Khlopotov <ilya.khlopotov@gmail.com> (github: khia)
Upstream-commit: e07920f680a829724f617819f0c5715ed9b5194a
Component: engine
 2014-02-28 17:34:31 -08:00
Brian Goff
d1105407b3 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)
Upstream-commit: d78fcb32ffd4736462792407abe734b51b81367a
Component: engine
 2014-02-27 23:31:36 -05:00
unclejack
a01a267fdb Merge pull request #4078 from vieux/rewrite_rmi 
Rewrite docker rmi
Upstream-commit: bde192bb80079ad89057a6df5ce676c5b3429901
Component: engine
 2014-02-26 21:30:24 +02:00
unclejack
1d5826bd31 Merge pull request #4292 from cpuguy83/4291_make_rm_default_for_build 
make docker build -rm=true default
Upstream-commit: 31ddc1669250565bdf41bc5329d16eb7e5bd7227
Component: engine
 2014-02-26 19:03:59 +02:00
Brian Goff
0eecb77d00 make docker build -rm=true default #4292 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 0b4aeb79d9e920f5a713a8ae57e3fdde011689e6
Component: engine
 2014-02-26 11:04:06 -05:00
unclejack
e002afd39f Merge pull request #4342 from vieux/update_maintainers_api 
update api Maintainers file
Upstream-commit: b8a8c0c686837b63650c58a6d0f76dfb0c7810f4
Component: engine
 2014-02-26 16:33:02 +02:00
Victor Vieux
b5a919751c update api Maintainers file 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 2f468a498ab9e8ebc5c7a9316e0242f8d7c54f1a
Component: engine
 2014-02-25 23:19:44 +00:00
Victor Vieux
1361d66b6f fix content-type docker copy 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 386e7c80c0dad778f873bcd6eadfa94ecb1ac840
Component: engine
 2014-02-25 22:49:19 +00:00
Victor Vieux
af968e2231 add version pkg 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 8dad771daa6572ca15949d3e53e825f4837c0af9
Component: engine
 2014-02-25 21:08:38 +00:00
Victor Vieux
fcbc1feb4a fix tests 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 964d82d00506c3005d102b9a1f94848182c5989d
Component: engine
 2014-02-25 21:08:08 +00:00
Victor Vieux
a7de7303da := / var 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: c7f825c0f08e8b6e3cd9dcebc81c21002afcf133
Component: engine
 2014-02-25 21:08:08 +00:00
Victor Vieux
0820020142 bump API version 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e7cc88c39f302c020f70a00bca54bddeecb608a4
Component: engine
 2014-02-25 21:08:07 +00:00
Victor Vieux
0724fa65be Rewrite docker rmi 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 795ed6b1e511fa6713fbc9ea4e8569aab15b98ff
Component: engine
 2014-02-25 21:08:07 +00:00
Tianon Gravi
52e14d4517 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)
Upstream-commit: 7bce5957a08ae31f4b83d1a13ad056e5b2af15e1
Component: engine
 2014-02-25 13:07:19 -07:00
Victor Vieux
1ab53bd0df fix gofmt 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 4434b63ff44c6994366afebeceb9b570bb9ee26c
Component: engine
 2014-02-24 23:10:45 +00:00
Solomon Hykes
fbf1d0f723 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)
Upstream-commit: 551355c9adac6a8b36244e1962e7a104611ae4af
Component: engine
 2014-02-24 11:54:50 -08:00
Solomon Hykes
14989a215e 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)
Upstream-commit: 919665a20a41f8e1b105342b1864ec05eb50cc97
Component: engine
 2014-02-24 19:24:29 +00:00
jakedt
5a22c079a1 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)
Upstream-commit: 7dcbae485cd46ad4b8af1ea758dd1d2c69f11fbe
Component: engine
 2014-02-20 19:22:13 -05:00
Jake Moshenko
733cdcbf96 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)
Upstream-commit: 90b0cce07b4f68d8099903f7e1470f79541f45d0
Component: engine
 2014-02-20 18:32:33 -05:00
Sven Dowideit
3700ea5ec4 my attempt to disentagle repository and registry (Issue #1439) 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 940c381dd5898df4dd863a2d76a122b6610f2940
Component: engine
 2014-02-18 20:16:08 +10:00
Victor Vieux
e253c6c2c6 Merge pull request #4168 from crosbymichael/add-listenbuffer 
Hold connections until the daemon has fully loaded
Upstream-commit: 4187f4e7504089d11740925a889e923f8adc54a7
Component: engine
 2014-02-17 16:04:49 -08:00
Michael Crosby
cf7d93d809 Improve error message only if no body is returned 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e23190b6b3ddd16b3a5f951a33e05fd75ebb8970
Component: engine
 2014-02-17 15:29:52 -08:00
Michael Crosby
78488bf1e6 Revert "Merge pull request #4151 from crosbymichael/improve-404-client-message" 
This reverts commit 6dd1bb9eb08dc144bc172b0052df7c3904896e56, reversing
changes made to 23aec9d7fcaa72db026c042046102b381e2e9d27.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d55cc64c4eb66c4ee536514e35e2e2094aa3d911
Component: engine
 2014-02-17 15:25:00 -08:00
Michael Crosby
7dcf535f27 Move job register into servapi 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: e743021193e589b1358d0eef0521e9d8878dd66d
Component: engine
 2014-02-17 15:10:51 -08:00
Victor Vieux
4a474363c9 Merge pull request #4113 from SvenDowideit/build-quiet-help 
add a little reenforcement to the help for docker build -q
Upstream-commit: 382659e03a59d68007fee1b54192233f7484c035
Component: engine
 2014-02-17 10:38:43 -08:00
Sven Dowideit
66f105510e 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)
Upstream-commit: 797b7d3446304be01c220c29f3dc6c4dcc2711be
Component: engine
 2014-02-17 11:35:55 +10:00
Fabio Falci
1bea948b6b 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)
Upstream-commit: a51441278afbfde76ac1ec1e01c619fe5733b895
Component: engine
 2014-02-16 15:49:36 +00:00
Michael Crosby
9fdd3cd967 Change name to listenbuffer 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: d5e41c1cb67b7ccb86fbbd80079642afd5055c2a
Component: engine
 2014-02-15 21:10:37 -08:00
Michael Crosby
9fff3868b1 Integration generic socket wait for docker api 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 778f1bf6639e52004608ca2289e04b8f7bddb14b
Component: engine
 2014-02-15 20:49:50 -08:00
Michael Crosby
09d6a6c5dd Use socket activation pkg for listeners 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 64716a21e464ac63dd9b287c832ae3431e1418d0
Component: engine
 2014-02-15 20:24:55 -08:00
Solomon Hykes
9c1c314fd9 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)
Upstream-commit: 44e10433c7a3811d4d0897192418cb6b62996584
Component: engine
 2014-02-15 23:24:51 +00:00
Solomon Hykes
377e102312 Remove duplicate function displayablePorts 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 567a422a65f71a58c3000aa66a42853c7e005bb4
Component: engine
 2014-02-15 14:55:57 -08:00
Solomon Hykes
024e6f564e 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)
Upstream-commit: ee59ba969fdd1837fe0151638cc01637e18139c3
Component: engine
 2014-02-15 14:55:51 -08:00
Michael Crosby
308d858c86 Merge pull request #4128 from vieux/fix_header_content-type_api 
Fix header content type api
Upstream-commit: 968f4800b51feb62916d1df83c5fbf17368ee6e1
Component: engine
 2014-02-13 20:29:09 -05:00
Victor Vieux
6ca6193a8d fix content-type for legacy 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 0b403b35318a68d848bd9d7cddcf850d2fa7bfa7
Component: engine
 2014-02-13 19:24:40 +00:00
Victor Vieux
1395c9829d fix content-type for job.Stdout.Add 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 4611a6bdd3270e4a404cae2d23c54dd94521c4ae
Component: engine
 2014-02-13 19:21:27 +00:00
unclejack
171ba8d692 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)
Upstream-commit: 31dde3ea05e1cf4c1f45083c1b6129e8c2a362df
Component: engine
 2014-02-13 13:54:37 +02:00
Solomon Hykes
cbe391a3ed 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)
Upstream-commit: e08a1c53aa5a19a17d40d41accbab040611c4411
Component: engine
 2014-02-11 19:59:52 -08:00
Victor Vieux
7dcdfb0d44 fix --run in docker commit 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5d29749e9dba4d918fc5ed5d6049f397e98967cf
Component: engine
 2014-02-10 23:52:15 +00:00
Guillaume J. Charmes
3287c05092 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)
Upstream-commit: d5d948a038933251fe39021883b71f3399ab116c
Component: engine
 2014-02-06 09:28:30 -08:00
Darren Shepherd
34bf15410e 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)
Upstream-commit: 55e5e37c4f085c0216a3d99dc7e3c3f12c2c7a88
Component: engine
 2014-02-05 19:09:55 -07:00
Victor Vieux
284cf5fe96 fix api with old version 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e43236c78ae8a466a36c323aa679ea581b42cdc5
Component: engine
 2014-02-01 01:24:39 +00:00