Commit Graph

13 Commits

Author SHA1 Message Date
4fcd3ec7b6 Merge auth package within registry
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 8d88ea0c15b7ce7fd2b0b695c498a7ffa0f2bc87
Component: engine
2014-03-10 17:16:58 -07:00
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
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
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
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
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
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
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
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
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
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
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
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