Commit Graph
2141 Commits
Author SHA1 Message Date
Solomon Hykes ceffc9ea1d Merge pull request #7152 from SvenDowideit/get-help-maintaining-softlayer-docs
MAINTAINERS: Get an extra pair of eyes on the Softlayer installation docs
2014-07-31 14:43:43 -07:00
Fred Lifton eccc44fad6 Merge pull request #7327 from ostezer/fix-articles-https
Docs: articles/https minor amendments and update
2014-07-31 14:33:56 -07:00
James Turnbull f77ae9b4f3 Merge pull request #7346 from proppy/patch-9
docs/google: bump container-vm image version
2014-07-31 17:22:01 -04:00
Aaron Huslage 32fdcaa419 Merge pull request #7193 from hollietealok/doc_remove
Removed docker_io_oauth_api.md: Docker is not currently accepting regist...
2014-07-31 15:19:58 -04:00
James Turnbull b5ef212ec1 Merge pull request #7337 from rogaha/add_ga_universal_analytics_support
Added GA universal analytics support
2014-07-31 09:00:08 -04:00
Jan Toebes bfacdfdccf Update nodejs_web_app.md
Updated to documentation to use the centos6 image instead of the unofficial tutum image of centos6.4
2014-07-31 08:54:22 +02:00
Johan Euphrosine 294f33b37a docs/google: bump container-vm image version
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
2014-07-30 22:50:05 -07:00
Roberto Gandolfo Hashioka e13b1fc05f Added GA universal analytics support
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
2014-07-30 15:32:14 -07:00
Brian Goff ba57d3d9e6 Replace old index image with hub
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-07-30 11:15:18 -04:00
O.S. Tezer 711fb3e19d Docs: articles/https minor amendments and update
This commit proposes some minor amendments and updates
for the articles/https.md document to fix certain errors, inc.:

 - Marking commands / flags as code (e.g. `tlsverify`) [done before rebase]
 - Capitalising the word Docker
 - Normalizing headers to match the rest of the docs;
 - Expanding the page description to match the page title and the content;
 - Capitalizing HTTPS etc.;
 - Some spelling error fixes;
 - Line-length adjustments to make it easier to read the raw file.

It does not propose any fundemental changes to the structure of the document.
Certain changes were based before another update on this doc.

Docker-DCO-1.1-Signed-off-by: O.S. Tezer <ostezer@gmail.com> (github: ostezer)
2014-07-30 18:09:58 +03:00
Tibor Vass b0fb0055d2 Add OS to docker info
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-07-30 10:37:52 -04:00
Timothy fae72c83be Apply @jamtur01's copy edit's to certificates.md
Docker-DCO-1.1-Signed-off-by: Timothy <timothyhobbs@seznam.cz> (github: timthelion)
2014-07-30 16:23:56 +03:00
hollietealok 2b9d8248d6 Removed OAuth doc from mkdocs.yml
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com> (github: hollietealok)
2014-07-29 13:56:19 -07:00
James Turnbull 475131cd4a Merge pull request #6877 from underscorephil/patch-1
Update softlayer.md
2014-07-29 13:20:55 -04:00
James Turnbull 4749b884fe Merge pull request #7256 from jstoja/docs-api-insert-image
Fixing docs - Insert api call
2014-07-29 13:19:22 -04:00
James Turnbull 900d54b48b Merge pull request #7269 from r0n22/patch-1
Update HTTP Proxy Section
2014-07-29 13:15:27 -04:00
Tianon Gravi fc637b5275 Standardize "apt-get install" usage across the repo
I might have missed some, but I think this is most of the offenders.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
2014-07-28 17:41:59 -06:00
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
James Turnbull 0758acfb03 Merge pull request #7199 from ipbabble/mp-changes
Fixed some typos for '--' Vs '-' in docker-run-1.md
2014-07-24 06:51:56 -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
William Henry 1403372963 Typo changes to docker-run-1.md - changing '-' to '--' where approp.
Docker-DCO-1.1-Signed-off-by: William Henry <whenry@redhat.com> (github: ipbabble)
2014-07-23 16:49:07 -04: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 2f23e204d9 Merge pull request #7151 from SvenDowideit/add-version-selection-ux
Add version selection ux to the Documentation.
2014-07-23 09:21:55 +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
SvenDowideit 4d109f6158 avoid publishing to the root unless specified, so old version releases only goto their own dir
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-22 19:05:18 +10:00
SvenDowideit 3853a9c612 the build cache is too agressive, and I am regularly getting builds using an old version - forcing the issue
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-07-22 17:21:03 +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