centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-12 06:19:22 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,528 Commits 57 Branches 28 Tags
8622641b585d18476f1bc26e1bb5d4298cecf78f
Commit Graph

8528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sven Dowideit
8622641b58 Merge pull request #6100 from SvenDowideit/pr_out_docs_installation_google_update_to_use_container_vm_images 
docs/installation/google: update to use container-vm images
 2014-05-29 11:41:43 +10:00
Johan Euphrosine
456ba11d89 docs/installation/google: update to use container-vm images 
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)

rebased by

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-05-29 11:36:28 +10:00
Sven Dowideit
b9619bf957 Merge pull request #6099 from SvenDowideit/pr_out_updated_documentation_for_mentioning_images_vs_containers 
updated documentation for mentioning images vs containers
 2014-05-29 11:23:53 +10:00
Robin Speekenbrink
a0505edc9a updated documentation for mentioning images vs containers 
Docker-DCO-1.1-Signed-off-by: Robin Speekenbrink <robin@kingsquare.nl> (github: fruitl00p)

rebased by

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-05-29 11:20:41 +10:00
Victor Vieux
b204b97c9a Merge pull request #6083 from bernerdschaefer/nsinit-drop-capabilities-after-changing-user 
SETUID/SETGID not required for changing user
 2014-05-28 17:29:17 -07:00
unclejack
341a2b85be Merge pull request #5402 from SvenDowideit/dont-update-authors 
Don't add yourself to the AUTHORs file - its generated
 2014-05-29 02:00:29 +03:00
unclejack
745445ebb7 Merge pull request #6067 from SvenDowideit/go-fmt-s 
gofmt does not result in the same thing as go fmt -s, which is what travis uses
 2014-05-29 01:58:03 +03:00
unclejack
a8131c7354 Merge pull request #6090 from alexlarsson/fix-console 
Fix /dev/console
 2014-05-29 01:09:33 +03:00
Alexander Larsson
7f5cd76824 libcontainer: Don't create a device node on /dev/console to bind mount on 
There is no need for this, the device node by itself doesn't work, since
its not on a devpts fs, and we can just a regular file to bind mount over.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-05-28 21:07:40 +02:00
Alexander Larsson
35d08bdd01 Revert "Remove the bind mount for dev/console which override the mknod/label" 
This reverts commit ae85dd5458.

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
 2014-05-28 21:07:27 +02:00
unclejack
2330be2adc Merge pull request #6076 from LK4D4/remove_collections_package 
Remove collections package
 2014-05-28 21:32:27 +03:00
Victor Marmol
5e2af07137 Merge pull request #5868 from jhspaybar/5749-libcontainerroutes 
libcontainer support for arbitrary route table entries
 2014-05-28 10:50:56 -07:00
William Thurston
bf7f360dca Fixes #5749 
libcontainer support for arbitrary route table entries

Docker-DCO-1.1-Signed-off-by: William Thurston <me@williamthurston.com> (github: jhspaybar)
 2014-05-28 17:42:02 +00:00
Bernerd Schaefer
0563453b91 SETUID/SETGID not required for changing user 
It is no longer necessary to pass "SETUID" or "SETGID" capabilities to
the container when a "user" is specified in the config.

Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
 2014-05-28 16:41:48 +02:00
Bernerd Schaefer
fd58524f81 Add system.SetKeepCaps and system.ClearKeepCaps 
Docker-DCO-1.1-Signed-off-by: Bernerd Schaefer <bj.schaefer@gmail.com> (github: bernerdschaefer)
 2014-05-28 16:40:36 +02:00
Sven Dowideit
f00c2e5007 Merge pull request #5957 from cgwalters/manpage-typo 
docker-run.1: Fix typo 'priviledged'
 2014-05-28 22:43:46 +10:00
Alexandr Morozov
31f0a61a3d Remove collections package 
It doesn't needed anymore аfter port and ip allocators refactoring
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4dmath@gmail.com> (github: LK4D4)
 2014-05-28 13:59:45 +04:00
Sven Dowideit
77ae37a383 Merge pull request #6068 from jpetazzo/update-wording-private-self-hosted-registries 
Replace 'private' with 'self-hosted' in a couple of places
 2014-05-28 14:39:05 +10:00
Victor Vieux
e56cf35c29 Merge pull request #6069 from crosbymichael/dm-errors 
Return devmapper errors with additional text
 2014-05-27 19:15:59 -07:00
Michael Crosby
6964012382 Return devmapper errors with additional text 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
 2014-05-27 19:03:57 -07:00
Jérôme Petazzoni
b64535166f Replace 'private' with 'self-hosted' in a couple of places 
Docker-DCO-1.1-Signed-off-by: Jérôme Petazzoni <jerome@docker.com> (github: jpetazzo)
 2014-05-27 18:57:25 -07:00
SvenDowideit
147ad3480d gofmt does not result in the same thing as go fmt -s file.go, which is what travis tests for 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-05-28 11:11:47 +10:00
O.S. Tezer
d53eb2f67c Merge pull request #6053 from jamtur01/produpdate 
Removed Docker production warnings
 2014-05-27 18:00:49 -07:00
Sven Dowideit
58a0e8af8a Merge pull request #6044 from zdover23/27May_dockerfile_2 
27 may dockerfile 2
 2014-05-28 07:58:02 +10:00
Sven Dowideit
b76302e5d9 Merge pull request #6040 from SvenDowideit/installer-docs 
Rewrite the mac and windows docs to use the boot2docker installers.
 2014-05-28 07:57:43 +10:00
SvenDowideit
5f5d66ade6 Rewrite the mac and windows docs to use the boot2docker installers. 
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
 2014-05-28 07:56:15 +10:00
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
Zac Dover
2bbf87504b fixed spacing, removed extraneous line 
Docker-DCO-1.1-Signed-off-by: Zac Dover <zdover@redhat.com> (github: zdover23)
 2014-05-28 03:32:52 +10: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
James Turnbull
838e69e11e Removed Docker production warnings 
* Removed warnings.
* Removed inconsistent Community installation sections.
* Fixed all installation page descriptions.
* Removed old .inc files.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
 2014-05-27 13:08:19 -04: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