docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,832 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

7832 Commits

Author SHA1 Message Date
unclejack 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
unclejack 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
Victor Vieux 5506e4b62d Merge pull request #4840 from vbatts/vbatts-load_from_input 
docker load: add --input flag
 2014-03-25 14:37:27 -07:00
Victor Vieux abef5cb0fc Merge pull request #4628 from kippandrew/port-allocator 
Fix port collision with dynamically allocated ports
 2014-03-25 14:30:10 -07:00
Victor Vieux 6643cc20fe Merge pull request #4794 from alexlarsson/dm-better-shutdown 
devicemapper: Better/faster shutdown
 2014-03-25 14:03:00 -07:00
Tianon Gravi e99297e4eb Merge pull request #4842 from pda/installer-devicemapper-comment 
Update AUFS comment in install.sh
 2014-03-25 14:29:46 -06:00
Paul Annesley 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)

Docker-DCO-1.1-Signed-off-by: Paul Annesley <paul@annesley.cc> (github: pda)
 2014-03-25 11:33:16 -07:00
Vincent Batts 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
Sven Dowideit 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
noducks 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
Sven Dowideit 30d25a3d27 Merge pull request #4814 from noducks/master 
Reminder for OSX users not to use SUDO
 2014-03-25 20:15:39 +10:00
viirya 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
noducks 69087f2d23 Reminder for OSX users not to use SUDO 
Useful for those who haven't made it to the examples page yet. dad4a998dc

Docker-DCO-1.1-Signed-off-by: No Ducks <onemannoducks@gmail.com> (github: noducks)
 2014-03-25 09:42:59 +00:00
Ryan Thomas a5ccb5b28d Docker-DCO-1.1-Signed-off-by: Ryan Thomas <rthomas@atlassian.com> (github: rthomas) 2014-03-25 14:45:11 +11:00
Vincent Batts 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
Sven Dowideit 267ca39921 Merge pull request #4839 from bflad/chef-docker-docs 
Add Chef usage documentation
 2014-03-25 12:38:45 +10:00
Brian Flad 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
Vincent Batts 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
Brian Flad 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
Sven Dowideit 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
Michael Crosby 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
Tianon Gravi e1035535ec Merge pull request #4837 from crosbymichael/remove-ci 
Remove docker-ci code from the repo
 2014-03-24 18:01:26 -06:00
Michael Crosby a258d048a2 Merge pull request #4778 from vbatts/vbatts-save_to_output 
`docker save --output` flags
 2014-03-24 16:52:08 -07:00
Guillaume J. Charmes 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
Michael Crosby 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
LK4D4 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby d503714285 Revert "Disable automatic killing of containers when docker stop fails" 
This reverts commit 8b5cf51d60.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-24 12:03:56 +00:00
Michael Crosby f1bd79ec97 Revert "fix failing test to use kill instead of stop" 
This reverts commit 4434dcee89.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-24 12:03:41 +00:00
Michael Crosby 10fdbc0467 Add unit test for lxc conf merge and native opts 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-24 07:16:40 +00:00
Michael Crosby 9a7be1b015 Add cpuset.cpus to cgroups and native driver options 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-24 05:33:11 +00:00
Michael Crosby 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
Victor Vieux 97e5295f43 Merge pull request #4800 from vieux/rename_network_driver 
rename lxc to bridge
 2014-03-21 16:52:40 -07:00
Michael Crosby 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
Tianon Gravi 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
Michael Crosby 2c58a1e288 Change placement of readonly filesystem 
We need to change it to read only at the very end so that bound,
copy dev nodes and other ops do not fail.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-21 14:17:17 +00:00
Michael Crosby 83618c2b81 Add more native driver options 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-21 14:07:16 +00:00
Michael Crosby 146a212f71 Change syntax to use dots 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-21 12:38:50 +00:00
Michael Crosby c9d7f858fd Change flag to -o and --opt 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-21 11:53:15 +00:00
Michael Crosby 7c726669cb Factor out the native driver config options 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-21 08:10:07 +00:00
Ken ICHIKAWA 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
Victor Vieux 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
Sven Dowideit 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
alambike 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
Sven Dowideit 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
Michael Crosby be5538d8a8 Allow containers to join the net namespace of other conatiners 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-21 00:48:17 +00:00
Michael Crosby 1bedae9107 Merge branch 'proppy-nsinit' into pluginflag 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-21 00:36:23 +00:00
Michael Crosby 87b0df997b Merge branch 'nsinit' of https://github.com/proppy/docker into proppy-nsinit 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-21 00:36:09 +00:00
Michael Crosby 70f3b9f4ce Add ability to work with individual namespaces 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-03-21 00:23:34 +00:00