c5e8598f0d
Merge pull request #7035 from tianon/standardize-apt-get-install
...
Standardize "apt-get install" usage across the repo
Upstream-commit: 503d124677f5a0221e1bf8c8ed7320a15c5e01db
Component: engine
2014-08-01 11:43:37 +10:00
c8eb8f3b81
First pass at replacing parent-child metaphor to describe docker links.
...
Addresses issue #7141
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
a little git by
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: SvenDowideit)
Upstream-commit: 631ea726e425713415e7a991f9a813d02b3f6d75
Component: engine
2014-08-01 11:09:00 +10:00
5fde8856c0
Merge pull request #7152 from SvenDowideit/get-help-maintaining-softlayer-docs
...
MAINTAINERS: Get an extra pair of eyes on the Softlayer installation docs
Upstream-commit: ceffc9ea1d9250f6a41d51c6b766dbd98580eeca
Component: engine
2014-07-31 14:43:43 -07:00
2a308976e9
Merge pull request #7327 from ostezer/fix-articles-https
...
Docs: articles/https minor amendments and update
Upstream-commit: eccc44fad62f8f31a89301ad9f9031fff8bbe661
Component: engine
2014-07-31 14:33:56 -07:00
dfe12ec6ad
Merge pull request #7346 from proppy/patch-9
...
docs/google: bump container-vm image version
Upstream-commit: f77ae9b4f3a71b0a572149561ca29ce9973ff4ab
Component: engine
2014-07-31 17:22:01 -04:00
c795cf8d33
Merge pull request #7193 from hollietealok/doc_remove
...
Removed docker_io_oauth_api.md: Docker is not currently accepting regist...
Upstream-commit: 32fdcaa4192577b629bb622991804f9f9148e823
Component: engine
2014-07-31 15:19:58 -04:00
cf3f6d4b4d
Merge pull request #7337 from rogaha/add_ga_universal_analytics_support
...
Added GA universal analytics support
Upstream-commit: b5ef212ec17932dc159a44f2a77c6e9d4cf4ee9d
Component: engine
2014-07-31 09:00:08 -04:00
ebf6bae6b0
docs/google: bump container-vm image version
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: 294f33b37a2d029164728534e781bc118d6689c2
Component: engine
2014-07-30 22:50:05 -07:00
8454954b93
Added GA universal analytics support
...
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com > (github: rogaha)
Upstream-commit: e13b1fc05f5caaa324678b7da2fc917943557185
Component: engine
2014-07-30 15:32:14 -07:00
a0d04e4cbb
Replace old index image with hub
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: ba57d3d9e63445f43e4d53da44e8dec27baa288d
Component: engine
2014-07-30 11:15:18 -04:00
41bdc73a7f
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)
Upstream-commit: 711fb3e19d4caf7f084d8d1eaca85cfbaef6e978
Component: engine
2014-07-30 18:09:58 +03:00
ca4826fd77
Add OS to docker info
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com > (github: tiborvass)
Upstream-commit: b0fb0055d279bc25aa2f91c112929ea8eb92c1db
Component: engine
2014-07-30 10:37:52 -04:00
4d9bca3054
Removed OAuth doc from mkdocs.yml
...
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com > (github: hollietealok)
Upstream-commit: 2b9d8248d6136645d3801693370e23d752f748f2
Component: engine
2014-07-29 13:56:19 -07:00
d0658f2e0a
Merge pull request #6877 from underscorephil/patch-1
...
Update softlayer.md
Upstream-commit: 475131cd4a5ef8178e36bf40721baf14ce2b6e26
Component: engine
2014-07-29 13:20:55 -04:00
8323f096b4
Merge pull request #7256 from jstoja/docs-api-insert-image
...
Fixing docs - Insert api call
Upstream-commit: 4749b884fe162edbd303fe6cc23223a7be9b9226
Component: engine
2014-07-29 13:19:22 -04:00
e9f01897da
Merge pull request #7269 from r0n22/patch-1
...
Update HTTP Proxy Section
Upstream-commit: 900d54b48b3091f9bd03f254d5ac9e458bdd53d9
Component: engine
2014-07-29 13:15:27 -04:00
e2390724e7
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)
Upstream-commit: fc637b5275c2fe23c9857a34316a783042d906b8
Component: engine
2014-07-28 17:41:59 -06:00
bed02719c0
Correct Typo In Documentation
...
Upstream-commit: 331200cbaae75a2876bac037c8df2e609bab9658
Component: engine
2014-07-28 14:39:17 -06:00
eec1c749e5
Update HTTP Proxy Section
...
Docker.service file location was missing the /usr dir.
Upstream-commit: 2095e22121833e5d38890c321a7a67ead405e3ec
Component: engine
2014-07-28 09:39:55 -04:00
122772c096
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)
Upstream-commit: 2d84b877bdce5e26aac164e14815e1c4fa8648b7
Component: engine
2014-07-26 13:03:04 +02:00
dd911c0f0c
Merge pull request #7238 from dericcrago/patch-1
...
apache2 was looking for two other directories
Upstream-commit: 1d21f75fa42cb51132c5c394987710b2200e7cb7
Component: engine
2014-07-25 19:38:47 -04:00
012e97ea38
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)
Upstream-commit: 7a5db6df995a131579020fd2cbacd49cb82e0aea
Component: engine
2014-07-25 15:49:33 -04:00
fa3a5b81e8
apache2 was looking for two other directories
...
/var/lock/apache2
/var/run/apache2
Upstream-commit: 3fb913ab7712634f1f311a9aab47c5eaa9f8fe9d
Component: engine
2014-07-25 10:14:52 -04:00
154cd33cd7
Typo in dockervolumes.md line 141?
...
Upstream-commit: 9503afbc9116b06585cf42715a7ae0bcd0fb7881
Component: engine
2014-07-25 09:06:38 +02:00
86189cd855
Merge pull request #7185 from thaJeztah/patch-1
...
Fix incorrect path in ENTRYPOINT example
Upstream-commit: ff28b0b9194ffdad15ea459e123e2f5b674dc7e6
Component: engine
2014-07-25 17:06:29 +10:00
6ae4c9014c
update go import path and libcontainer
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com > (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
e57cffad17
Merge remote-tracking branch 'upstream/master' into doc_remove
...
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com > (github: hollietealok)
Upstream-commit: 97283fa985623ca59183026a13951e7e9e6ce144
Component: engine
2014-07-24 11:28:19 -07:00
0b23dd95aa
Merge pull request #7199 from ipbabble/mp-changes
...
Fixed some typos for '--' Vs '-' in docker-run-1.md
Upstream-commit: 0758acfb03a3a93903e0f4a109f6e9e30b07fbc1
Component: engine
2014-07-24 06:51:56 -07:00
53aae89bf0
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)
Upstream-commit: 2819d9b4062914daa5b6bd4d08676807859eae3f
Component: engine
2014-07-24 14:48:23 +02:00
c9b056319d
Merge pull request #7181 from timruffles/patch-3
...
[DOCS] replace foo/bar with concrete names
Upstream-commit: bb6217c0556709c7e911faa8e968c3f72a38464d
Component: engine
2014-07-24 12:26:10 +10:00
c26325b9c4
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)
Upstream-commit: 140337296353b2dd37678b0e30cbf0ebe2cfd9e7
Component: engine
2014-07-23 16:49:07 -04:00
39a4d3a21d
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)
Upstream-commit: 9fbae5924471b63e4f33fbd87f797183ab68be92
Component: engine
2014-07-23 11:55:56 -07:00
6dc7b294a3
Merge pull request #7180 from rhuss/patch-1
...
Fixed parent-child relationship description
Upstream-commit: b9024174be37919e85c3127cf0d41f6d94d835c3
Component: engine
2014-07-23 10:17:19 -07:00
d72a089030
[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)
Upstream-commit: 455e837e207a01153947fc81e3a22d6bb37d2c89
Component: engine
2014-07-23 15:21:16 +01:00
6f7c4cc1d5
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.
Upstream-commit: 0a4b39b6a4e9faeea5d8c679e7b03e317a7b02f9
Component: engine
2014-07-23 10:23:14 +02:00
a347eb0112
user facing documentation changes in master atm
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 5743cc3423b48a0a3c78c7640bb10d840c911604
Component: engine
2014-07-23 12:40:10 +10:00
9140b4810a
Merge pull request #7151 from SvenDowideit/add-version-selection-ux
...
Add version selection ux to the Documentation.
Upstream-commit: 2f23e204d9190895ae761d97495fdbd7093b625a
Component: engine
2014-07-23 09:21:55 +10:00
f95bb42771
Merge pull request #7169 from fredlf/update_osx-install
...
Initial revisions to b2d doc, new screenshots.
Upstream-commit: 0d118ffbf83711bf8f6271308e290ab011bc460e
Component: engine
2014-07-23 07:34:06 +10:00
724ac12239
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)
Upstream-commit: 4002b4623c91d94d93f8575c4a554392202aa44d
Component: engine
2014-07-22 13:14:42 -07:00
e47a5bae71
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)
Upstream-commit: f1e072c8d5266b9c4b320458bffcd87254b36c55
Component: engine
2014-07-22 10:39:40 -05:00
a1bdcc2e10
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)
Upstream-commit: 29f1ed833cc4cb06dc3f65f440736915111152a0
Component: engine
2014-07-22 20:25:21 +10:00
5fa2981ff0
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)
Upstream-commit: 4d109f6158c7607ee4cd9907b17ddba5f4d29d04
Component: engine
2014-07-22 19:05:18 +10:00
eb7d72cb32
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)
Upstream-commit: 3853a9c612e3d19dadea26153c9cebaec8cd67a4
Component: engine
2014-07-22 17:21:03 +10:00
bbc55c5d41
Merge pull request #7134 from MidnightDesign/patch-1
...
Fix a typo in the tutorial
Upstream-commit: 9dc82e6102f25b9d0da1410616a4af830e4349f4
Component: engine
2014-07-22 12:00:06 +10:00
ccf84ea953
Merge pull request #7112 from proppy/patch-8
...
docs/installation/google: update gcloud options
Upstream-commit: 1cc55fda3d53d2d54a877b85f36008b0654af9f4
Component: engine
2014-07-22 11:22:08 +10:00
74853679b5
Merge pull request #7030 from runvnc/patch-1
...
Better example for data container
Upstream-commit: 324010ad66f4fa393f53cbfa2fa68d21dabb5941
Component: engine
2014-07-22 10:49:27 +10:00
ac0be9871d
Merge pull request #6569 from bcexelbi/rhel-install-update
...
Updated Red Hat Enterprise Linux installation instructions for version 7
Upstream-commit: 8f75de2d4e11c12a7d17726f005f03e742f12057
Component: engine
2014-07-22 10:30:18 +10:00
0bdbb48e10
Merge pull request #7104 from mheon/sigproxy_docs
...
Update docs on --sig-proxy
Upstream-commit: 61b675d3bb6a645f7f4683253f78f0f9ddfe5a22
Component: engine
2014-07-21 13:42:41 -07:00
5d850a0bb6
Resolve merge conflict, attempt 3
...
Docker-DCO-1.1-Signed-off-by: AJ Bowen <aj@gandi.net > (github: soulshake)
Upstream-commit: 319a8a241e0b9182ea309b886e2d23e2f4d73c6c
Component: engine
2014-07-21 12:18:59 -07:00
21d78da869
docs/installation/google: update gcloud options
...
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com > (github: proppy)
Upstream-commit: e1bb99d925895f4eaec54e7b8254f5250dfeb7dd
Component: engine
2014-07-21 10:55:12 -07:00
