Brandon Philips
87fb2c973d
server: add socket activation
...
This adds the ability to socket activate docker by passing in
`-H fd://*` along with examples systemd configuration files.
The fastest way to test this is to run:
```
/usr/lib/systemd/systemd-activate -l 127.0.0.1:2001 /usr/bin/docker -d -H 'fd://*'
docker -H tcp://127.0.0.1:2001 ps
```
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-01-27 17:17:07 -08:00
Brandon Philips
e996daeed0
vendor: add github.com/coreos/go-systemd/activation
...
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com> (github: philips)
2014-01-27 17:17:07 -08:00
Michael Crosby
ed12818f99
Merge pull request #3789 from pwaller/issue-3674
...
Fix for #3674 Can't `rm` containers when disk full
2014-01-27 17:00:16 -08:00
Michael Crosby
eaca205942
Merge pull request #3796 from tianon/dockerfile-btrfs
...
Update Dockerfile to be based on 13.10 instead of 12.04, add linux-libc-dev dep, remove s3cmd backports nonsense
2014-01-27 16:54:06 -08:00
Tianon Gravi
94566b748e
Update Dockerfile to be based on 13.10 instead of 12.04 so that we can remove our s3cmd backports need, and so we can have the new linux-libc-dev dependency we need for compiling the btrfs driver without nasty APT hackery
...
In addition, we've now hard-coded LXC version 0.8 compiled from source so that we can have the most stable dev environment possible.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-01-27 17:18:33 -07:00
Guillaume J. Charmes
1ddd815191
Merge pull request #3798 from vieux/3777_fix
...
fix mflag import
2014-01-27 15:31:54 -08:00
Victor Vieux
c4e7b0e4d5
fix mflag import
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-27 23:29:56 +00:00
Peter Waller
c4c558d138
Add Peter Waller <p@pwaller.net> to AUTHORS
...
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
2014-01-27 22:21:58 +00:00
Guillaume J. Charmes
77d4df1e0b
Merge pull request #3787 from pwaller/issue-3786
...
Fix for issue #3786 `docker rm` unmounts in the wrong order
2014-01-27 13:41:14 -08:00
Victor Vieux
99dd387fd7
Merge pull request #3784 from 1uptalent/3783_release_push_lock
...
FIX #3783 : Release the push lock after the image push is completed
2014-01-27 13:40:28 -08:00
Victor Vieux
f4b75e06bc
Merge pull request #3790 from crosbymichael/move-port-allocators
...
Move port allocators into network driver
2014-01-27 13:36:33 -08:00
Peter Waller
6f3d8d3908
Fix for #3674 Can't `rm` containers when disk full
...
Rather than creating a new directory and moving it there before
deleting that new directory, just move the directory we intend to
delete.
In the old way, the Mkdirall could fail, which meant that you
couldn't delete containers when the disk was full.
Tested.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
2014-01-27 21:34:11 +00:00
Victor Vieux
91b11dd156
Merge pull request #3776 from fabiofalci/container_list_test
...
Improve test for container list `ps`
2014-01-27 13:32:23 -08:00
Andy Rothfusz
bbfc531b51
Merge pull request #3542 from SvenDowideit/curl-prepare-commit-msg
...
move the contributing hook into contrib, and use curl in the same way as the gofmt above
2014-01-27 12:09:03 -08:00
Andy Rothfusz
093531ddb7
Merge pull request #3781 from mattymo/patch-1
...
Clean up grammar on puppet.rst
2014-01-27 12:06:43 -08:00
Andy Rothfusz
adae0b248d
Merge pull request #3773 from mnaberez/supervisord-apache2-example
...
Use exec to replace bash with apache2 after environment is set up
2014-01-27 12:01:59 -08:00
Andy Rothfusz
ef37fdd1a8
Merge pull request #3770 from aaronfeng/fix-image-name-pos
...
move image name into correct position
2014-01-27 11:56:36 -08:00
Victor Vieux
f9e9637a9f
Merge pull request #3756 from crosbymichael/fix-register-nobridge
...
Refactor and fix register interface when bridge does not exist
2014-01-27 10:40:42 -08:00
Peter Waller
32753c3d24
Fix for issue #3786
...
This is a fix for the case that one mount is inside another mount and
docker can't then delete the resulting container.
Docker-DCO-1.1-Signed-off-by: Peter Waller <p@pwaller.net> (github: pwaller)
2014-01-27 17:31:25 +00:00
Abel Muiño
77a34920b2
Release the push lock at the end
...
Docker-DCO-1.1-Signed-off-by: Abel Muiño <amuino@gmail.com> (github: amuino)
2014-01-27 16:22:59 +01:00
mattymo
551e1a766c
Update puppet.rst
2014-01-27 18:21:48 +03:00
mattymo
03d9984f17
Clean up grammar on puppet.rst
2014-01-27 15:13:17 +03:00
Fabio Falci
1ee1dc2340
Improve test for container list `ps`
...
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
2014-01-26 23:14:50 +00:00
Michael Crosby
5e69b3837b
Fix issues from rebase on master
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-26 14:07:43 -08:00
Michael Crosby
da61b99b39
Simplify logic for registering ports
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-26 14:01:38 -08:00
Michael Crosby
ac2a4e6410
Refactor to support multiple ip addresses
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-26 14:01:38 -08:00
Guillaume J. Charmes
da30eb7c20
Remove std sort and use custom sort for performances
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-01-26 14:01:38 -08:00
Michael Crosby
303ed3c830
Add port allocator and move ipset into orderedintset
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-01-26 14:01:38 -08:00
Mike Naberezny
2ba2a8ae40
Use exec to replace bash with apache2 after environment is set up
...
Docker-DCO-1.1-Signed-off-by: Mike Naberezny <mike@naberezny.com> (github: mnaberez)
2014-01-26 11:53:22 -08:00
James Turnbull
ffdc2d2657
Merge pull request #3771 from srt32/patch-1
...
Update README.md typo
2014-01-26 09:07:00 -08:00
Aaron Feng
31e5958009
move image name into correct position
...
Docker-DCO-1.1-Signed-off-by: Aaron Feng <aaron.feng@gmail.com> (github: aaronfeng)
2014-01-26 08:11:30 -05:00
Simon Taranto
33ee78004f
Update README.md
...
Docker-DCO-1.1-Signed-off-by: Simon Taranto <simon.taranto@gmail.com> (github: srt32)
2014-01-26 00:08:55 -07:00
Guillaume J. Charmes
b1d26985d0
Update tests to have custom routes
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
2014-01-24 17:18:48 -08:00
Guillaume J. Charmes
eedaf08eb8
Merge branch 'fix-register-nobridge' of https://github.com/crosbymichael/docker into crosbymichael-fix-register-nobridge
2014-01-24 17:02:19 -08:00
Victor Vieux
e6ae8f6d21
Merge pull request #3757 from vieux/auth_job
...
move auth to a job
2014-01-24 16:54:48 -08:00
Victor Vieux
1f8b1bb84e
move auth to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 16:51:02 -08:00
Victor Vieux
e2003fea3a
Merge pull request #3728 from vieux/container_job
...
Move containers to a job
2014-01-24 16:10:46 -08:00
Victor Vieux
5ea2986ce5
Move containers to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 16:07:42 -08:00
Victor Vieux
748a009cc4
Merge pull request #3727 from vieux/push_job
...
push job
2014-01-24 15:42:22 -08:00
Victor Vieux
e8ee18fa29
push job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 15:34:08 -08:00
Victor Vieux
4a708f9f5b
Merge pull request #3739 from vieux/events_jobs
...
move events to job
2014-01-24 15:32:25 -08:00
Victor Vieux
5cc6312bfc
move events to job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 15:28:17 -08:00
Victor Vieux
59df776469
Merge pull request #3621 from vieux/inspect_job
...
Inspect job
2014-01-24 15:22:20 -08:00
Victor Vieux
5fd8aa02ba
merge 2 jobs, no more buffer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 15:13:30 -08:00
Victor Vieux
a7e9baaf89
update attach to use the new job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 15:11:38 -08:00
Victor Vieux
134435a79c
move inspect to 2 jobs
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 15:11:38 -08:00
Victor Vieux
22fb3e0f38
Merge pull request #3645 from vieux/rmi_job
...
Move rmi to a job
2014-01-24 15:10:02 -08:00
Victor Vieux
f41e0cf048
fix error handling
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 14:59:46 -08:00
Victor Vieux
177f658882
remove buffer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 14:57:18 -08:00
Victor Vieux
564e6bc780
Move docker rmi to a job
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-01-24 14:55:11 -08:00