72dc19fd7d
authors update
2014-03-26 10:30:57 -04:00
61f7d967ed
typo fix
2014-03-26 10:24:16 -04:00
baba9cde95
Return error when existing bridge does not match ip
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-26 11:51:27 +00:00
b2721e05ce
Change version to 0.9.1-dev
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-03-26 00:18:45 +02:00
d36176652e
Bump to version v0.9.1
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Conflicts:
VERSION
2014-03-26 00:18:19 +02:00
5506e4b62d
Merge pull request #4840 from vbatts/vbatts-load_from_input
...
docker load: add --input flag
2014-03-25 14:37:27 -07:00
abef5cb0fc
Merge pull request #4628 from kippandrew/port-allocator
...
Fix port collision with dynamically allocated ports
2014-03-25 14:30:10 -07:00
6643cc20fe
Merge pull request #4794 from alexlarsson/dm-better-shutdown
...
devicemapper: Better/faster shutdown
2014-03-25 14:03:00 -07:00
e99297e4eb
Merge pull request #4842 from pda/installer-devicemapper-comment
...
Update AUFS comment in install.sh
2014-03-25 14:29:46 -06:00
576278102e
install.sh (get.docker.io) aufs comment updated.
...
devicemapper has landed, but the TODO hasn't been actioned presumably
because aufs is still preferred over devicemapper when available[1].
Comment updated accordingly.
Citation [1]: 267ca39921/runtime/graphdriver/driver.go (L40-L46)
2014-03-25 11:33:16 -07:00
2517370088
docker load: added example of a multiple tag image
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-03-25 08:30:59 -04:00
d9c1116303
Merge pull request #4845 from noducks/link_fix
...
Force flag to prevent file already exists error.
2014-03-25 21:03:04 +10:00
8e434c314e
Force flag to prevent file already exists error.
...
Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com> (github: noducks)
2014-03-25 10:26:45 +00:00
30d25a3d27
Merge pull request #4814 from noducks/master
...
Reminder for OSX users not to use SUDO
2014-03-25 20:15:39 +10:00
293157b8b3
check if working dir is a directory and raise corresponding errors when making dir.
...
Docker-DCO-1.1-Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com> (github: viirya)
2014-03-25 17:47:08 +08:00
69087f2d23
Reminder for OSX users not to use SUDO
...
Useful for those who haven't made it to the examples page yet. dad4a998dc
2014-03-25 09:42:59 +00:00
a5ccb5b28d
Docker-DCO-1.1-Signed-off-by: Ryan Thomas <rthomas@atlassian.com> (github: rthomas)
2014-03-25 14:45:11 +11:00
c6c7c03cdd
docker load: doc clarification
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-03-24 23:36:07 -04:00
267ca39921
Merge pull request #4839 from bflad/chef-docker-docs
...
Add Chef usage documentation
2014-03-25 12:38:45 +10:00
c84ff187c6
Fix typo in Using Chef documentation description
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com> (github: bflad)
2014-03-24 22:29:54 -04:00
84e1fdf35d
docker load: add --input flag
...
for those that do not care to read from redirected stdin
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
2014-03-24 21:43:26 -04:00
bb034c6b42
Add Chef usage documentation
...
Docker-DCO-1.1-Signed-off-by: Brian Flad <bflad417@gmail.com> (github: bflad)
2014-03-24 21:39:15 -04:00
0b2b5a594b
Merge pull request #4786 from SvenDowideit/run--lxc-conf-is-lxc-driver-only-atm
...
add a note that --lxc-conf is lxc-driver only.
2014-03-25 11:21:06 +10:00
4585d2da3e
Merge pull request #4751 from enokd/master
...
Fixes #3369 Repeated slash-'/' characters; harmonize across all name-related commands
2014-03-24 17:43:02 -07:00
e1035535ec
Merge pull request #4837 from crosbymichael/remove-ci
...
Remove docker-ci code from the repo
2014-03-24 18:01:26 -06:00
a258d048a2
Merge pull request #4778 from vbatts/vbatts-save_to_output
...
`docker save --output` flags
2014-03-24 16:52:08 -07:00
c3ff1f41bb
Merge pull request #4835 from crosbymichael/reverst-stop-kill
...
Revert back to the default stop functionality of SIGKILL after timeout
2014-03-24 16:33:38 -07:00
dece260f3a
Merge pull request #4832 from LK4D4/fix_events_hanging_#4804
...
Workaround for hanging events. Fixes #4804
2014-03-24 16:26:50 -07:00
c7540b3e94
Workaround for hanging events. Fixes #4804
...
Docker-DCO-1.1-Signed-off-by: LK4D4 <lk4d4math@gmail.com> (github: LK4D4)
2014-03-24 22:31:32 +04:00
68dd722e3c
Promote btrfs
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-24 14:15:04 +00:00
f41135bc11
As far as I know this code is not used or maintained
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
2014-03-24 12:39:56 +00:00
d503714285
Revert "Disable automatic killing of containers when docker stop fails"
...
This reverts commit 8b5cf51d60
2014-03-24 12:03:56 +00:00
f1bd79ec97
Revert "fix failing test to use kill instead of stop"
...
This reverts commit 4434dcee89
2014-03-24 12:03:41 +00:00
5294bf7e67
Merge pull request #4775 from LK4D4/remove_duplicate_dns_#4714
...
Remove duplication of Dns in config merging.
2014-03-21 17:08:06 -07:00
97e5295f43
Merge pull request #4800 from vieux/rename_network_driver
...
rename lxc to bridge
2014-03-21 16:52:40 -07:00
de450b23be
Merge pull request #4761 from ichik1/fix-display-of-since-time-exit
...
Fix since time exit display when s.FinishedAt is zero
2014-03-21 16:48:30 -07:00
708ecd7da2
Add mention of mounting cgroupfs properly to PACKAGERS.md
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-21 14:17:09 -06:00
4002eac8b8
Fix since time exit display when s.FinishedAt is zero
...
When s.FinishedAt is zero, the since time exit in docker ps doesn't display correct time.
For example
```
Exited (0) 292.471209 years ago
```
This patch fixes the since time exit to display nothing if s.FinishedAt is zero.
Docker-DCO-1.1-Signed-off-by: Ken ICHIKAWA <ichikawa.ken@jp.fujitsu.com> (github: ichik1)
2014-03-21 15:28:02 +09:00
69db806542
Merge pull request #4518 from tianon/sync-DCO-with-developercertificate.org
...
Resync the DCO text with upstream at http://developercertificate.org/
2014-03-20 23:07:08 -07:00
14502f0f1c
Merge pull request #4803 from alambike/patch-1
...
Added Eixo::Docker to the list of libraries
2014-03-21 12:49:51 +10:00
79c11b19ec
Added Eixo::Docker to the list of libraries
...
Docker-DCO-1.1-Signed-off-by: Javier Gómez <alambike@gmail.com> (github: alambike)
2014-03-21 03:13:06 +01:00
8329cd55e1
Merge pull request #4796 from cpuguy83/fix_single_dash_args_in_dcs
...
Fix double single dash arg issues in docs
2014-03-21 11:18:21 +10:00
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
8944fb2e9b
rename lxc to bridge
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
2014-03-20 21:51:28 +00:00
fbd6fee4ab
Fix double single dash arg issues in docs
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-03-20 14:14:54 -04:00
a9fa1a13c3
devicemapper: Better/faster shutdown
...
Right now shutdown is looping over *all* devicemapper
devices and actively deactivating them, this is pretty
slow if you have a lot of non-active containers. We
instead only deactivate the devices that are mounted.
We also do the shutdown unmount using MNT_DETACH which
forces the unmount in the global namespace, even if it
is busy because of some container having it mounted.
This means the device will be freed when that container
exits.
Also, we move the call to waitClose to deactivateDevice
because all callers of any of them call both anyway.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
2014-03-20 17:38:35 +01:00
56c156190a
Merge pull request #4782 from unclejack/fix_TestCreateStartRestartStopStartKillRm
...
fix failing test to use kill instead of stop
2014-03-20 09:10:32 -07:00
2678af4ea8
Merge pull request #4790 from tianon/fix-release
...
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
2014-03-19 22:49:19 -06:00
6b46a09186
Fix a lot of the sha256 and md5 stuff to be more DRY and extendible, and on more things (specifically, the tgz files too)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-03-19 22:25:09 -06:00
372b7282cb
Merge pull request #4788 from SvenDowideit/sign-releases-fixup
...
Fix bugs in release.sh
2014-03-19 18:19:25 -06:00
Justin Simonelis
Justin Simonelis
Michael Crosby
unclejack
Victor Vieux
Tianon Gravi
Paul Annesley
Vincent Batts
Sven Dowideit
noducks
viirya
Ryan Thomas
Brian Flad
Michael Crosby
Guillaume J. Charmes
LK4D4
Ken ICHIKAWA
alambike
Djibril Koné
Brian Goff
Alexander Larsson