1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
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
William Henry
a14a88e53d Fixed some typos in docker-build.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

 Changes to be committed:
	modified:   contrib/man/md/docker-build.1.md
2014-05-27 12:05:48 -06:00
William Henry
2cb184ade5 Some changes to semantics around tagging, detaching.
Tried to clarify some of the semantics regarding --tag and renaming etc.
Added some text clarifying how to detach from a running containers.
Fixed a bug that reference /varlog instead of /dev/log.

Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)

Changes to be committed:
	modified:   docker-attach.1.md
	modified:   docker-build.1.md
	modified:   docker-run.1.md
	modified:   docker-tag.1.md
2014-05-27 11:56:11 -06: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
William Henry
ca49da41ee Merge branch 'master' of https://github.com/dotcloud/docker 2014-05-27 09:11:12 -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
Solomon Hykes
5b54be92ca Update beam version to fix a crash when calling unknown backend.
Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-05-27 12:14:42 +00:00
Solomon Hykes
c5b8976409 [WIP] switch to Beam 2014-05-31 00:33:53 +00:00
Solomon Hykes
2b547caa75 Fix Hub and StackSender to honor modes
StackSender.Send and Hub.Send now return a valid Sender and Receiver
when the corresponding flags are set in `mode`.

Signed-off-by: Solomon Hykes <solomon@docker.com>
2014-05-27 12:05:52 +00:00
Solomon Hykes
e4beab1432 Hub: convenience API to register jobs
* `Hub.Register`
* `Hub.RegisterTask`
* `Hub.RegisterName`
2014-05-27 06:26:20 +00: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
Solomon Hykes
84027640c2 Merge pull request #10 from bfirsh/add-cloud-backend-dependencies 2014-05-26 19:40:11 -07:00
Solomon Hykes
b69fb4ec3b Merge pull request #11 from bfirsh/cloud-backend-fixes 2014-05-26 19:39:26 -07: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
Victor Vieux
0be44d1a0a now busybox as nc
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-05-23 21:03:52 +00:00
Tibor Vass
7e38d6a358 Merge pull request #6019 from tianon/update-dockerfile-busybox
Add specific branch of @jpetazzo's busybox to clone from so we can assume nice things about it
2014-05-23 13:46:48 -07:00