centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-02 17:28:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,498 Commits 55 Branches 28 Tags
080d8a7a8367dcf7bdbcac00ec99fbfb05c7ab51
Commit Graph

8498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sven Dowideit
080d8a7a83 Merge pull request #6005 from jimperrin/master 
Updated documentation to include CentOS installation instructions.
 2014-05-28 07:55:03 +10:00
unclejack
70c6d806c8 Merge pull request #6063 from vieux/improve_number_detection 
improve numeric only id detection
 2014-05-28 00:36:57 +03:00
Victor Vieux
b8a89ba963 Merge pull request #6062 from crosbymichael/update-waits 
Update wait calls to call Wait on Command
 2014-05-27 14:17:19 -07:00
Victor Vieux
f2baa364a1 improve numeric only id detection 
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
 2014-05-27 21:03:12 +00:00
Michael Crosby
5310e8575f Update lxc to use cmd.Wait() 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-27 13:52:05 -07:00
Michael Crosby
b9de22e828 Update wait calls to call Wait on Command 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-27 13:38:24 -07:00
Victor Vieux
a605379927 Merge pull request #6059 from erikh/fix-tests 
Fix race condition in CLI tests: diff was not acquiring a container lock
 2014-05-27 13:19:32 -07:00
unclejack
0d9a5ce6dd Merge pull request #6025 from crosbymichael/concurrent-names 
Improve name generation on concurrent requests
 2014-05-27 23:18:19 +03:00
Michael Crosby
88cefe20b4 Merge pull request #6030 from erikh/5971-fix-zombies 
Add Wait() calls in the appropriate spots
 2014-05-27 12:53:17 -07:00
Erik Hollensbe
8b77e0183e Fix race condition in CLI tests: diff was not acquiring a container lock 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-05-27 12:28:31 -07:00
Erik Hollensbe
b01c3283fa libcontainer/nsinit: remove Wait call from Exec and Kill from Attach in tty_term.go 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-05-27 12:26:56 -07:00
Erik Hollensbe
92e41a02ce Add Wait() calls in the appropriate spots 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
 2014-05-27 12:26:56 -07:00
Michael Crosby
bdb5aa4c27 Merge pull request #5937 from LK4D4/ipallocator_refactoring 
Ip allocator refactoring
 2014-05-27 12:22:36 -07:00
Victor Vieux
b904d0af56 Merge pull request #6051 from LK4D4/move_some_build_tests_to_integration_cli 
Move some build tests to integration cli
 2014-05-27 12:11:42 -07:00
Victor Vieux
754797bba7 Merge pull request #6000 from cyphar/5619-fix-unsafe-path-resolution 
Properly handle paths with symlink path components
 2014-05-27 12:06:19 -07:00
Alexandr Morozov
ef94ac7d2f Ip allocator refactoring 
We don't need ordered set anymore, also some cleanings and simple
benchmark.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-05-27 22:56:26 +04:00
Michael Crosby
a22622b022 Merge pull request #5983 from vieux/add_tianon_mailmap_authors 
add Tianon as maintainer of AUTHORS and .mailmap
 2014-05-27 10:43:17 -07:00
Tianon Gravi
b2cf28306d Merge pull request #6029 from jeffreybolle/master 
Update upstart script to ensure networking is up before starting docker
 2014-05-27 11:23:54 -06:00
Jim Perrin
b7e88250f4 Update documentation per suggestions from ostezer 
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org> (github: jimperrin)
 2014-05-27 08:59:30 -05:00
James Turnbull
cf47b46036 Merge pull request #6046 from thomasleveil/patch-1 
Update ubuntulinux.md - bash completion
 2014-05-27 05:39:39 -07:00
Thomas LEVEIL
250229605f Update ubuntulinux.md and debian.md 
to add bash completion for the docker command
 2014-05-27 14:17:01 +02:00
Alexandr Morozov
b25a9b7138 Move entrypoint build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-05-27 08:36:38 +04:00
LK4D4
81d1641139 Move expose build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-05-27 08:00:35 +04:00
LK4D4
c58991f31a Move cmd build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-05-27 08:00:35 +04:00
LK4D4
b05be686ec Move env build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-05-27 08:00:35 +04:00
LK4D4
40630ce4b6 Move relative workdir build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-05-27 08:00:35 +04:00
LK4D4
360fb3d4ea Move user build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-05-27 08:00:34 +04:00
LK4D4
3dd4c5f499 Move maintainer build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-05-27 08:00:34 +04:00
LK4D4
11f7f0bf9b Move volume build test to integration-cli 
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
 2014-05-27 08:00:34 +04:00
O.S. Tezer
e5ba9f6443 Merge pull request #6042 from dcorking/patch-1 
Update fedora.md
 2014-05-26 12:27:45 -07:00
David Corking
b26bebac31 Update fedora.md 
The renamed package 'wmdocker' did not make it into Fedora 20. It is still available for rawhide (will be Fedora 21.)
 2014-05-26 12:29:27 +01:00
Sven Dowideit
4a2ca56ea0 Merge pull request #6039 from zdover23/26May_dockerfile 
Dockerfile.5.md stub
 2014-05-26 16:46:12 +10:00
Zac Dover
41a913b390 Dockerfile.5.md stub 
Properly formatted DCO:
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)

Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: )
 2014-05-26 15:57:20 +10:00
Tianon Gravi
bddcbc1b15 Merge pull request #6037 from tianon/fix-debootstrap-typo 
Fix embarrassing debootstrap typo :)
 2014-05-25 22:37:59 -06:00
Tianon Gravi
dd3319636d Fix embarrassing debootstrap typo :) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
 2014-05-25 21:59:43 -06:00
Jeffrey Bolle
c52889db27 Ensure networking is up before starting docker 
This resolves a problem that I have been having where docker starts before networking is up. See issue #5944 for more details.

Docker-DCO-1.1-Signed-off-by: Jeffrey Bolle <jeffreybolle@gmail.com> (github: jeffreybolle)
 2014-05-24 19:03:11 +01:00
James Turnbull
7393eafde7 Merge pull request #6001 from jamtur01/introfixes 
Some fixes to the Intro pages
 2014-05-25 00:21:40 +10:00
James Turnbull
955bfda99a Some fixes to the Intro pages 
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-05-25 00:20:59 +10:00
Jim Perrin
1cb2570a27 Correct appearance of shell output 
Docker-DCO-1.1-Signed-off-by: Jim Perrin <jperrin@centos.org> (github: jimperrin)
 2014-05-24 08:33:41 -05:00
Sven Dowideit
22777fbc1e Merge pull request #6006 from therealprologic/master 
Updated installation docs for CRUX as a Docker Host.
 2014-05-24 16:08:14 +10:00
Sven Dowideit
d81912e323 Merge pull request #6016 from ronsmits/patch-1 
Update using_supervisord.md
 2014-05-24 16:07:32 +10:00
Sven Dowideit
b820b9778f Merge pull request #6023 from proppy/patch-4 
docs/reference/builder: fix USER doc
 2014-05-24 13:41:34 +10:00
cyphar
ff24a32876 integration-cli: cp: added symlink-related tests 
This patch adds cli integration tests for #5619, which are tests
to ensure that symlinks are kept relative to the container rootfs
(even when a path component).

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
 2014-05-24 11:01:20 +10:00
cyphar
328d2cba11 daemon: container: properly handle paths with symlink path components 
This patch fixes the incorrect handling of paths which contain a
symlink as a path component when copying data from a container.
Essentially, this patch changes the container.Copy() method to
first "resolve" the resource by resolving all of symlinks encountered
in the path relative to the container's rootfs (using pkg/symlink).

Docker-DCO-1.1-Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
 2014-05-24 11:01:19 +10:00
Michael Crosby
6ec86cb6e5 Improve name generation on concurrent requests 
Fixes #2586

This fixes a few races where the name generator asks if a name is free
but another container takes the name before it can be reserved.  This
solves this by generating the name and setting it.  If the set fails
with a non unique error then we try again.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-23 17:51:16 -07:00
Johan Euphrosine
e89cb9a5e0 docs/reference/builder: fix USER doc 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
 2014-05-23 17:20:15 -07:00
Guillaume J. Charmes
baed5d7433 Merge pull request #6020 from vieux/update_test_remove_nc_bind_mount 
now busybox as nc
 2014-05-23 14:48:24 -07:00
Michael Crosby
3b4b0a901d Merge pull request #6018 from vishh/stats_strongtype 
Strong type all stats exported by libcontainer
 2014-05-23 14:35:14 -07:00
Michael Crosby
f3bd86376e Merge pull request #6022 from crosbymichael/iptables-wait 
Add check for iptables xlock support
 2014-05-23 14:25:51 -07:00
Michael Crosby
034babf175 Add check for iptables xlock support 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-23 14:18:50 -07:00