knappe
331200cbaa
Correct Typo In Documentation
2014-07-28 14:39:17 -06:00
Jan Toebes
2519872d77
Update nodejs_web_app.md
...
The image centos:centos6.4 doesn't exist. Instead you have to choose between the official centos6 or centos7. Both images does not work together with de yum npm install. When choosing an centos6.5 from another distributor (tutum) it works.
2014-07-28 20:43:24 +02:00
r0n22
2095e22121
Update HTTP Proxy Section
...
Docker.service file location was missing the /usr dir.
2014-07-28 09:39:55 -04:00
Julien Bordellier
2d84b877bd
Adding the query parameters to insert api call for all <= 1.10 and
...
removing the insert documentation for > 1.10 since it has been removed
in 1.11. This commit fixes #7183
Docker-DCO-1.1-Signed-off-by: Julien Bordellier <me@julienbordellier.com> (github: jstoja)
2014-07-26 13:03:04 +02:00
James Turnbull
1d21f75fa4
Merge pull request #7238 from dericcrago/patch-1
...
apache2 was looking for two other directories
2014-07-25 19:38:47 -04:00
Andrew Weiss
7a5db6df99
updated article to reflect changes in config; fixed hyperlinks #7243
...
Docker-DCO-1.1-Signed-off-by: Andrew Weiss <andrew.weiss@outlook.com> (github: anweiss)
2014-07-25 15:49:33 -04:00
Deric Crago
3fb913ab77
apache2 was looking for two other directories
...
/var/lock/apache2
/var/run/apache2
2014-07-25 10:14:52 -04:00
Michiel@unhosted
9503afbc91
Typo in dockervolumes.md line 141?
2014-07-25 09:06:38 +02:00
Sven Dowideit
ff28b0b919
Merge pull request #7185 from thaJeztah/patch-1
...
Fix incorrect path in ENTRYPOINT example
2014-07-25 17:06:29 +10:00
Victor Vieux
b3ee9ac74e
update go import path and libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-24 22:19:50 +00:00
hollietealok
97283fa985
Merge remote-tracking branch 'upstream/master' into doc_remove
...
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com> (github: hollietealok)
2014-07-24 11:28:19 -07:00
Sebastiaan van Stijn
2819d9b406
Fix incorrect path in ENTRYPOINT example
...
The ENTRYPOINT example uses "/usr/bin/ls" as path, but `ls` is located at `/bin/ls`.
Docker-DCO-1.1-Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (github: thaJeztah)
2014-07-24 14:48:23 +02:00
Sven Dowideit
bb6217c055
Merge pull request #7181 from timruffles/patch-3
...
[DOCS] replace foo/bar with concrete names
2014-07-24 12:26:10 +10:00
hollietealok
9fbae59244
Removed docker_io_oauth_api.md: Docker is not currently accepting registrations for third party auth while it's determined how this will be done, if at all, in the future.
...
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com> (github: hollietealok)
2014-07-23 11:55:56 -07:00
James Turnbull
b9024174be
Merge pull request #7180 from rhuss/patch-1
...
Fixed parent-child relationship description
2014-07-23 10:17:19 -07:00
Tim Ruffles
455e837e20
[DOCS] replace foo/bar with concrete names
...
namespaces are not well documented, and I had to jump around to other docs. replacing `foo/bar` hopefully makes what's going on here a bit more obvious.
Docker-DCO-1.1-Signed-off-by: Tim Ruffles <timruffles@gmail.com> (github: timruffles)
2014-07-23 15:21:16 +01:00
Roland Huß
0a4b39b6a4
Fixed parent-child relationship description
...
"db" is the parent image, and "web" links to it as the child image. There was a typo in the document which reversed the relation.
2014-07-23 10:23:14 +02:00
SvenDowideit
5743cc3423
user facing documentation changes in master atm
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-23 12:40:10 +10:00
Sven Dowideit
0d118ffbf8
Merge pull request #7169 from fredlf/update_osx-install
...
Initial revisions to b2d doc, new screenshots.
2014-07-23 07:34:06 +10:00
Fred Lifton
4002b4623c
Initial revisions to b2d doc, new screenshots.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Final revisions to B2D doc.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-07-22 13:14:42 -07:00
Phil
f1e072c8d5
Updating to reflect changes in the SoftLayer portal and product naming conventions.
...
Docker-DCO-1.1-Signed-off-by: Phil Jackson <underscorephil@gmail.com> (github: underscorephil)
2014-07-22 10:39:40 -05:00
SvenDowideit
29f1ed833c
Get an extra pair of eyes on the Softlayer installation docs
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-22 20:25:21 +10:00
Sven Dowideit
9dc82e6102
Merge pull request #7134 from MidnightDesign/patch-1
...
Fix a typo in the tutorial
2014-07-22 12:00:06 +10:00
Sven Dowideit
1cc55fda3d
Merge pull request #7112 from proppy/patch-8
...
docs/installation/google: update gcloud options
2014-07-22 11:22:08 +10:00
Sven Dowideit
324010ad66
Merge pull request #7030 from runvnc/patch-1
...
Better example for data container
2014-07-22 10:49:27 +10:00
Sven Dowideit
8f75de2d4e
Merge pull request #6569 from bcexelbi/rhel-install-update
...
Updated Red Hat Enterprise Linux installation instructions for version 7
2014-07-22 10:30:18 +10:00
Fred Lifton
61b675d3bb
Merge pull request #7104 from mheon/sigproxy_docs
...
Update docs on --sig-proxy
2014-07-21 13:42:41 -07:00
soulshake
319a8a241e
Resolve merge conflict, attempt 3
...
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net> (github: soulshake)
2014-07-21 12:18:59 -07:00
Johan Euphrosine
e1bb99d925
docs/installation/google: update gcloud options
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-07-21 10:55:12 -07:00
Rudolph Gottesheim
9ff7bbe0ac
Fix a typo in the tutorial
2014-07-21 10:34:54 +02:00
Marc Abramowitz
4ac6375790
Fix minor grammar issues in dockervolumes.md
2014-07-20 17:05:37 -07:00
Sven Dowideit
e60543400d
Merge pull request #7117 from hipertracker/patch-1
...
Update dockerlinks.md
2014-07-21 09:43:23 +10:00
Jaroslaw Zabiello
a781de0c10
Update dockerlinks.md
...
Added missing command for logging into web container.
2014-07-19 05:38:11 +01:00
Ben Firshman
b82778b293
Remove blank "use" documentation
...
Introduced in dotcloud/docker#3070
Docker-DCO-1.1-Signed-off-by: Ben Firshman <ben@firshman.co.uk> (github: bfirsh)
2014-07-18 18:45:20 -07:00
Solomon Hykes
c7bc929e01
Merge pull request #3070 from alexlarsson/certificates
2014-07-18 18:27:00 -07:00
Brett Kochendorfer
95caf8c485
Update runmetrics.md
2014-07-18 16:16:19 -05:00
Daniel, Dao Quang Minh
4b5b3b4321
fix doc references
...
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-07-18 17:45:25 +00:00
Daniel, Dao Quang Minh
06bc4e0752
Add logout command
...
"docker logout [SERVER]" will remove the registry server' credentials from
.dockercfg file. If a server is not specified, it will log user out of the
default docker registry server
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
2014-07-18 17:42:49 +00:00
Jason Livesay
8273cb4b9b
Improve data volume container example.
...
Docker-DCO-1.1-Signed-off-by: Jason Livesay <ithkuil@gmail.com> (github: runvnc)
2014-07-18 10:22:15 -07:00
Fred Lifton
36608696e1
Merge pull request #6984 from jameskyle/6937-allow-setting-of-docker-config-directory
...
Closes 6937. Allows setting of docker config dir.
2014-07-18 09:51:50 -07:00
Matthew Heon
31351d08a3
Update docs on --sig-proxy to indicate that SIGKILL and SIGSTOP cannot be proxied
...
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
2014-07-18 12:32:04 -04:00
Brian (bex) Exelbierd
204e080932
Updated Red Hat Enterprise Linux installation instructions for version 7
...
Docker-DCO-1.1-Signed-off-by: Brian Exelbierd <bex@pobox.com> (github: bcexelbi)
2014-07-18 08:08:27 +02:00
Sven Dowideit
c11660169a
Merge pull request #7094 from fredlf/update_docker-hub
...
New screenshots and a few small edits.
2014-07-18 02:36:33 +00:00
Sven Dowideit
7a5ddd5df8
Merge pull request #7082 from bdevloed/patch-1
...
Update usingdocker.md
2014-07-18 01:26:15 +00:00
Sven Dowideit
9f036fc6ee
Merge pull request #7068 from fredlf/add_image-tag
...
Added info re: image[:tag] to make docs consistent.
2014-07-18 00:03:57 +00:00
Fred Lifton
c92e13f678
New screenshots and a few small edits.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-07-17 16:41:50 -07:00
Fred Lifton
ca015b8885
Merge pull request #7027 from SvenDowideit/use-a-hello-world-micro-image
...
Tianon made a micro-image (sub one meg?) that we can use as a very fast ...
2014-07-17 11:31:54 -07:00
bdevloed
f9b3147e2c
Update usingdocker.md
...
Change --help example command to match output in docs
2014-07-17 14:44:18 +02:00
James Turnbull
4ae27be2cd
Merge pull request #7049 from albers/default-option
...
removed default --rm option from example build command
2014-07-17 04:52:16 -04:00
Sven Dowideit
6ae07e2410
Tianon made a micro-image (sub one meg?) that we can use as a very fast to download 'yes, your docker can download and run an image' test
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-07-17 11:54:35 +10:00
Fred Lifton
41d6ab6318
Added info re: image[:tag] to make docs consistent. Fixed a markdown issue.
...
Closes issue #6833
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-07-16 16:39:44 -07:00
Victor Vieux
905ae7bb28
Merge pull request #7045 from SvenDowideit/pr_out_re_write_to_put_the_emphasis_on_the_format
...
re-write to put the emphasis on the format
2014-07-16 11:47:05 -07:00
Harald Albers
c5f55a233d
removed default --rm option from example build command
...
this line gave the false impression that containers are not removed
unless you specify the --rm argument.
2014-07-16 11:18:08 +02:00
Sven Dowideit
3b3f0fa085
Merge pull request #6601 from SvenDowideit/6510-docker-pause-docs
...
6510 docker pause docs
2014-07-16 03:30:49 +00:00
SvenDowideit
fa5bce2859
the package now adds the bash_completion too
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-16 11:46:18 +10:00
SvenDowideit
ed8b017ee0
re-write to put the emphasis on the format
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-16 11:02:44 +10:00
Johan Euphrosine
c6197058a8
docs/google: bump container-vm image version
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-07-15 17:41:59 -07:00
SvenDowideit
58955a30ff
re-jig the info into all the places
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-16 09:42:46 +10:00
Brian Goff
3957d72f9c
Add cgroups freezer info
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: SvenDowideit)
2014-07-16 09:42:46 +10:00
Sven Dowideit
5b8a6eb05f
Add cli.md documentation for docker-pause and docker-unpause
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-07-16 09:42:46 +10:00
Victor Vieux
01d1615001
missing doc for 6896
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-15 23:32:12 +00:00
Sven Dowideit
d736754a47
Merge pull request #7039 from jamtur01/apidoc
...
Removed legacy api.md file
2014-07-15 23:12:22 +00:00
James Kyle
c0471ee35a
Closes 6937. Allows setting of docker config dir.
...
Can now dynamically set the docker config directory through an
environment variable.
export DOCKER_CONFIG=/path/to/docker_config/
Default behavior remains the same, e.g. ~/.docker
Documentation for change added to the https.md docs.
Docker-DCO-1.1-Signed-off-by: James A. Kyle <james@jameskyle.org> (github: jameskyle)
2014-07-15 15:47:00 -07:00
Fred Lifton
9c8b59c1b0
Merge pull request #6892 from mpapo/docs-docker-aufs-limitation
...
Add small note about AUFS layer limitation
2014-07-15 15:03:46 -07:00
Sven Dowideit
5bdf2cf459
Merge pull request #7037 from henning/patch-3
...
Adjust Link description to match target
2014-07-15 21:55:06 +00:00
Sven Dowideit
b6e1cfc075
Merge pull request #6855 from SvenDowideit/update-osx-installer-image-to-show-final-page
...
The installer completed page now contains information on next steps, so ...
2014-07-15 21:17:29 +00:00
James Turnbull
4fc8edd0df
Removed legacy api.md file
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-07-15 16:40:43 -04:00
Henning Sprang
fb51a330bb
Adjust Link description to match target
...
The target document headline is "Managing data in containers" and so should the link be named.
2014-07-15 22:24:08 +02:00
Michaël Pailloncy
2a230729da
Update small note about layer limitation
...
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com> (github: mpapo)
2014-07-15 21:58:01 +02:00
Michaël Pailloncy
d91d381856
Add small note about AUFS layer limitation
...
Docker-DCO-1.1-Signed-off-by: Michaël Pailloncy <mpapo.dev@gmail.com> (github: mpapo)
2014-07-15 21:58:01 +02:00
Harald Albers
88c6017644
no need to create a link to the docker binary
2014-07-15 14:18:28 +02:00
Sven Dowideit
f976014410
The installer completed page now contains information on next steps, so is more useful than the intro
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-07-15 13:50:12 +10:00
Solomon Hykes
781a47e3f3
Merge pull request #6885 from tianon/standard-curl-sSL
2014-07-14 18:39:31 -07:00
Fred Lifton
9d6f295d5d
Merge pull request #6994 from Aigeruth/fix/docs/registry_api
...
Fix MarkDown in Docker Registry API docs
2014-07-14 15:15:29 -07:00
Michael Crosby
7ebd49c49a
Merge pull request #6968 from vieux/cap_add_drop
...
Add support for --cap-add and --cap-drop
2014-07-14 10:42:29 -07:00
Sven Dowideit
b93787e6e0
Merge pull request #6967 from fredlf/copyedit-builds
...
Added bitbucket hook info and warning re: validating accounts.
2014-07-14 03:35:37 +00:00
Gabor Nagy
b1677f9d09
Fix MarkDown in Docker Registry API docs
...
Docker-DCO-1.1-Signed-off-by: Gabor Nagy <mail@aigeruth.hu> (github: Aigeruth)
2014-07-13 11:15:52 +02:00
James Turnbull
07d93c6e34
General cleanup of the builder.md file
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-07-12 11:30:51 -04:00
James Turnbull
b5a69da5b6
Merge pull request #6990 from folieadrien/missing-rm-api-docs
...
add missing api docs for #6863
2014-07-12 11:21:54 -04:00
Adrien Folie
88326e9b91
add missing docs for rm
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
2014-07-12 06:33:43 +02:00
James Turnbull
b2ba1a9ce5
Rewrote the ENTRYPOINT section in builder
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-07-11 22:12:59 -04:00
Victor Vieux
6bb27f18d1
update api doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-12 01:03:12 +00:00
Victor Vieux
e7d9854414
add doc
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-11 23:43:21 +00:00
Victor Vieux
fe5ab5b058
proper rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-11 23:27:23 +00:00
Adrien Folie
5ba11e6890
update CLI & api docs
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
2014-07-11 23:26:08 +00:00
Victor Vieux
00c1668011
Merge pull request #6985 from vieux/fix_api_1.14
...
bump api to 1.14 & update docs
2014-07-11 15:35:25 -07:00
Victor Vieux
cdfdbe9bc6
proper rebase
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
2014-07-11 22:39:43 +00:00
Fred Lifton
358758e99f
Edits based on feedback from docs team.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-07-11 11:42:29 -07:00
Aaron Huslage
c3d91263a8
Clarified TLS Docs
...
Made a "Secure by default" section, create 2048-bit keys, various cleanups.
Docker-DCO-1.1-Signed-off-by: Aaron Huslage <huslage@gmail.com> (github: huslage)
2014-07-11 14:35:01 -04:00
Fred Lifton
e80d075633
Added bitbucket hook info and warning re: validating accounts.
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-07-10 16:51:16 -07:00
Timothy
e855c4b921
Add --device flag to allow additional host devices in container
...
We add a --device flag which can be used like:
docker run --device /dev/sda:/dev/xvda:rwm ubuntu /bin/bash
To allow the container to have read write permissions to access the host's /dev/sda via a node named /dev/xvda in the container.
Note: Much of this code was written by Dinesh Subhraveti dineshs@altiscale.com (github: dineshs-altiscale) and so he deserves a ton of credit.
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: timthelion)
2014-07-10 10:35:53 -07:00
Sven Dowideit
d9265007a0
Merge pull request #6854 from tomfotherby/patch-1
...
Add documention on how to Mount a Host File as a Data Volume
2014-07-10 10:29:15 +00:00
Sven Dowideit
98e099e3a0
Merge pull request #6945 from fredlf/copyedit-builds
...
New screenshots and revisions to builds.md
2014-07-10 09:06:58 +00:00
Bryan Bess
1df4049e17
Fix typos
...
Docker-DCO-1.1-Signed-off-by: Bryan Bess <squarejaw@bsbess.com> (github: squarejaw)
2014-07-09 23:14:06 -05:00
Adrien Folie
680e27d6ec
bump api to 1.14 & update docs
...
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
2014-07-10 03:24:01 +02:00
Fred Lifton
9319b7aef1
Merge pull request #6942 from jamtur01/addcopy
...
Replaced selected docs references to ADD with COPY
2014-07-09 17:48:31 -07:00
Fred Lifton
ce9d48e896
New screenshots and revisions to builds.md
...
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
2014-07-09 16:43:39 -07:00
James Turnbull
a1ddf57216
Replaced selected docs references to ADD with COPY
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
2014-07-09 17:13:26 -04:00
James Turnbull
aa0eca03e6
Updated docker logs timestamp to RFC3339
...
Currently the docker logs timestamp flag generates log entries like:
$ sudo docker logs -ft daemon_dave
[May 10 13:06:17.934] hello world
It uses Go's StampMilli timestamp to generate the timestamp. The entry
is also wrapped in [ ].
This is non-standard operational timestamp and one that will require
custom parsing.
The new timestamp is RFC3999Nano and generates entries like:
2014-05-10T17:42:14.999999999Z07:00 hello world
These are readily parsed by tools like ELK.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-09 11:59:06 -04:00
Tom Fotherby
e479cae7cf
Tiny text reformat (as per review comments)
...
Docker-DCO-1.1-Signed-off-by: Tom Fotherby <github@tomfotherby.com> (github: tomfotherby)
2014-07-09 08:21:31 +01:00