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
unclejack
49a45d80f2 Dockerfile,contrib,hack: remove buildpack-deps
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2016-02-04 20:22:34 +02:00
Jeffrey Morgan
26b8b63dcc Merge pull request #1437 from londoncalling/add-toolbox-overview
added toolbox overview
2016-02-04 10:16:49 -08:00
Alexandre Beslic
6ca3f2fdd2 Merge pull request #1758 from runseb/patch-1
Update networking.md
2016-02-04 10:13:59 -08:00
Jeffrey Morgan
45afe72962 Fix window size file loading on windows
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com>
2016-02-04 10:13:25 -08:00
Richard Scothern
97fbaaa5e2 Merge pull request #1422 from moxiegirl/add-docker-to-title
Update title of Registry to Docker Registry
2016-02-04 10:10:03 -08:00
Tianon Gravi
61464701fa Merge pull request #19727 from pandrew/improve_test-deb-install
improve test-deb-install
2016-02-04 10:09:47 -08:00
Aaron Lehmann
b0989446eb Rename Name method of Repository to Named
This makes code that gets the name as a string read like
repo.Named().Name() instead of repo.Name().Name().

Requested in
https://github.com/docker/docker/pull/19887#discussion_r51479753

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-02-04 09:55:36 -08:00
Daniel Nephin
a55210413c Update docs for version being a string.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-04 17:21:15 +00:00
Aanand Prasad
93426cec4c Merge pull request #2824 from dnephin/docs_version_is_a_string
Update docs for version being a string
2016-02-04 17:20:32 +00:00
Daniel Nephin
a7c2987991 Update docs for version being a string.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-04 12:19:43 -05:00
Paul Liljenberg
620b8250e8 improve test-deb-install
This PR adds support for using the DOCKER_BUILD_PKGS env var to
better help defining what packege to build. It also adds support
for the integration-daemon so we can run it as a bundle.

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>

add directory test

Adds missing directory test. This helps verifying that
DOCKER_BUILD_PKGS is a directory and exists before continueing.

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>

fix indent

Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
2016-02-04 18:14:08 +01:00
Mary Anthony
261d358c79 Change Notary to show Docker Notary in menu
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-04 08:50:44 -08:00
Mary Anthony
8fdd7f5dfe Update title of Registry to Docker Registry
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-04 08:37:45 -08:00
Jess Frazelle
60821c6dfd Merge pull request #19997 from boucher/patch-2
Pass KEEPBUNDLE in Docker build environment.
2016-02-04 08:37:12 -08:00
David Calavera
3329c94e25 Merge pull request #19994 from runcom/fix-test-for-19936
integration-cli: fix minimum and default api version test
2016-02-04 08:33:07 -08:00
David Calavera
e2bfedbc40 Merge pull request #19998 from estesp/remove-stray-printf
Remove stray printf
2016-02-04 08:29:11 -08:00
Spencer Rinehart
6caa188730 Fix example formatting for depends_on.
Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block.

I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file.  It resets the markdown indentation in a way that works.

Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-04 15:57:29 +00:00
Aanand Prasad
386974f831 Merge pull request #2814 from nubs/patch-1
Fix example formatting for depends_on.
2016-02-04 15:56:27 +00:00
Jess Frazelle
a1b07a8010 Merge pull request #19999 from thaJeztah/carry-19668-wheezy-journald
(carry 19668) don't try to install journald driver on wheezy
2016-02-04 07:44:42 -08:00
Sebastiaan van Stijn
6c2b014d5e dont try to install journald driver on wheezy
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-04 16:22:23 +01:00
Phil Estes
77590d4dae Remove stray printf
This came in with the Windows CI work and I assume was meant for local
debug, but adds a bare printf line to the test output.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-02-04 10:13:31 -05:00
Aanand Prasad
413a55aa71 Connect container to networks before starting it
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 14:43:11 +00:00
Ross Boucher
d23778168d Pass KEEPBUNDLE in Docker build environment.
This is an alternate solution to the problem described in #19969.

Signed-off-by: Ross Boucher <rboucher@gmail.com>
2016-02-04 09:42:41 -05:00
runseb
e121dd0986 Update networking.md
Small typo in bridge driver when creating bridge network.

Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
2016-02-04 14:46:43 +01:00
Mary Anthony
a1e183c4bd Fix format for command
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-04 05:13:19 -08:00
Antonio Murdaca
fe6b88e3fa integration-cli: fix minimum and default api version test
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-02-04 13:58:08 +01:00
Zhang Wei
3c0a91d227 Fix error for restarting container
Fix error message for `--net container:b` and `--ipc container:b`,
container `b` is a restarting container.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-04 20:14:50 +08:00
Antonio Murdaca
38e774d32c Merge pull request #19949 from Microsoft/jjh/testapiresize
Windows CI: Port docker_api_resize_test.go
2016-02-04 10:11:32 +01:00
Dongluo Chen
d5a3ff10af Merge pull request #1756 from vieux/remove_goveralls
remove goveralls
2016-02-04 00:50:33 -08:00
yuzou
44c0b9ae87 read the actual number of bytes according to the initial size.
Signed-off-by: yuzou <zouyu7@huawei.com>
2016-02-04 16:14:35 +08:00
Victoria Bialas
2bdfb8f211 added toolbox overview
added keywords and weight to the metadata for menu placement

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-03 23:32:33 -08:00
Chun Chen
c199506b59 Display internal flag on network inspect
Also adds internal network tests for bridge network

Signed-off-by: Chun Chen <ramichen@tencent.com>
2016-02-04 15:28:37 +08:00
Daniel Nephin
80d02e84e2 Merge pull request #2808 from aanand/connect-before-start
Connect container to networks before starting it
2016-02-03 23:49:56 -05:00
John Howard
4080ce35e0 Windows CI: Port docker_api_resize_test.go
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-03 20:30:06 -08:00
Tibor Vass
66a4e557f9 Merge pull request #19702 from tiborvass/host-specific-passthru-token
Add test to make sure the new registry pass-thru token is only sent to the intended hosts
2016-02-03 21:57:32 -05:00
Sebastiaan van Stijn
a03e85b448 Merge pull request #19877 from HackToday/fixdoc
Add support details for storage driver
2016-02-04 03:07:15 +01:00
Lei Jitang
af614a19dc Clean up container rootf mounts on daemon start fixes #19679
When the daemon shutdown ungracefully, it will left the running
containers' rootfs still be mounted. This will cause some error
when trying to remove the containers.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-02-03 20:52:32 -05:00
Victor Vieux
46b57a3cbe Merge pull request #1753 from SvenDowideit/rolfes-second-doc-branch-carry
new content for install-on-aws and images for other topics
2016-02-03 17:47:00 -08:00
Ben Firshman
bdddbe3a73 Improve names in Compose file 2 example
Just makes it a bit clearer what's going on.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-02-03 17:42:57 -08:00
Jess Frazelle
d47812dd1d Merge pull request #19886 from AndrewGuenther/185160-init-socket-fix
Wait to fire start event until socket is created
2016-02-03 17:38:52 -08:00
Nathan LeClaire
7660fedf4b Merge pull request #2957 from londoncalling/docs-machine-b
Improve intro to machine docs
2016-02-03 17:37:12 -08:00
Nathan LeClaire
6cffd5a99b Merge pull request #2986 from SvenDowideit/retitle-as-docker-machine
Retitle as Docker Machine
2016-02-03 17:37:01 -08:00
Victor Vieux
45ab44d142 remove goveralls
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-02-03 17:36:48 -08:00
Jess Frazelle
dcde68b955 Merge pull request #19952 from WeiZhang555/fix-err-restarting-1
Fix error message for pause a restarting container
2016-02-03 17:34:19 -08:00
Tibor Vass
f0a58947ab Merge pull request #19979 from mavenugo/gccgoci
Use waitRun in TestDockerNetworkHostModeUngracefulDaemonRestart
2016-02-03 20:33:52 -05:00
Jess Frazelle
e74c07b947 Merge pull request #19980 from tonistiigi/fix-microsoft-vendor-dir
Remove case sensitive duplicate dir in vendor
2016-02-03 17:32:14 -08:00
Rolfe Dlugy-Hegwer
b88cb64358 new content for install-on-aws and images for other topics
Issues #1606 #1605

Signed-off-by: Rolfe Dlugy-Hegwer <rollfedh-contractor@docker.com>
2016-02-03 17:13:56 -08:00
Diogo Mónica
78dda3d16d Merge pull request #514 from docker/delg-empty-path
Ensure empty string path is properly handled, add --all-paths flag
2016-02-03 17:11:11 -08:00
Sven Dowideit
fba9db1dee Retitle as Docker Machine
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-02-03 17:01:54 -08:00
Victor Vieux
b8f2fd969e Merge pull request #1755 from air/patch-1
fix bullet list in last paragraph
2016-02-03 16:56:26 -08:00