Commit Graph

49 Commits

Author SHA1 Message Date
c6caf278a1 Fixing seds, deleting old stuff
Signed-off-by: Mary Anthony <mary@docker.com>

Upding sed, adding script to avoid redirects, remove mkdos

Signed-off-by: Mary Anthony <mary@docker.com>

Ignoring graphics with sed

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing kitematic image

Signed-off-by: Mary Anthony <mary@docker.com>

Removing draft

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing link

Signed-off-by: Mary Anthony <mary@docker.com>

removing from the menu

Signed-off-by: Mary Anthony <mary@docker.com>

Updatiing order of project material

Signed-off-by: Mary Anthony <mary@docker.com>

Removing from Regsitry v2 content per Olivier

Signed-off-by: Mary Anthony <mary@docker.com>

tweaking the touchup

Signed-off-by: Mary Anthony <mary@docker.com>

Removing include; only used four places; hugo global var replace

Signed-off-by: Mary Anthony <mary@docker.com>

Entering fixes from page-by-page

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 328dbd0aa2a5aca656b45c4148cb09f715fbe677
Component: engine
2015-06-17 21:05:37 -07:00
9a276424db retooling for hugo
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f93fee5f48cc92df8668380e4edc2b7bbd6c62c6
Component: engine
2015-06-15 13:19:38 -07:00
f475565e21 Add Kitematic documentation to docs.master.docker.com
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 82bd3886d54da4fcbcd29cde957568a75ecd186e
Component: engine
2015-05-20 01:57:45 +00:00
df9fadfc2f Updating branch for machine docs
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 8c9d67921a44e4f189373d8dc10fc8946039918d
Component: engine
2015-05-05 14:33:31 -07:00
86214961de Adding support for GITHUB IGNORES to the engine Dockerfile
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 51977a230715be285f8b8076f43bd1e5803d051c
Component: engine
2015-04-30 15:21:05 -07:00
18e1b423ee Fixing a few links in registry
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 54ff1dcb829e67d62dd4686bdc19522d63c3e0d3
Component: engine
2015-04-21 18:36:37 -07:00
d18c57d820 Docker Registry Server > Docker Registry
Fixing registry index
Tested on beta and this redirect works

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 7b2b7df3866d0c0101e9367b7f4f63bfed5faac4
Component: engine
2015-04-18 19:19:48 -07:00
b527679d3d docs: speed up build by reducing build steps
- should be also easier to maintain

Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk>
Upstream-commit: bbe6df128802b22605f9eb079f105460ec78ac6f
Component: engine
2015-04-18 13:28:52 +02:00
f4a4f24956 Updates to Compose docs and ENV vars
- Compose teamhad forgotten some documentation
- Updated ENV for Distribution also
- Forgot one of the readability sections

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 3a883672417fcb2b3ac0d57d992285849840bfb2
Component: engine
2015-04-17 13:08:57 -07:00
917596f19e Updating with final version from Stephen
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b4b21ff0a6c45c1565c74e6f923b2c7e8ca565d6
Component: engine
2015-04-16 11:40:36 -07:00
fdae7fc749 for 1.6
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f44aa3b1fbe5e042fee0fb78507ebac35eca3d04
Component: engine
2015-04-16 11:33:49 -07:00
0e1a426ed8 In with the old menu layout
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: fe8fb24b530016e56ab584526c093daccacf6040
Component: engine
2015-04-15 19:02:01 -07:00
c4fa112c81 Adding environment variables for sub projects
Fixes issue #12186
Fixing variables per Jess

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: ef8b917fac0b3d98146cadd890234d9179ae2021
Component: engine
2015-04-08 12:23:50 -07:00
2fbe877abc Updating with man pages for distribution
Went through the man pages to update for the
v2 instance. Checked against the commands.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: b6d55ebcbc93ce66aa9906aa87e1081f21ba1650
Component: engine
2015-04-01 21:02:19 -07:00
853ddc3c31 Fix clear cache docs release.
Clear the cache for all files. Don't worry about what changed.

Move the docs release script back to the docker/docker repo, so we all can
easily watch the changes.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Upstream-commit: 4602241f11b626d40bf67cfe3a13d3c146adf335
Component: engine
2015-03-11 10:11:13 -07:00
c182424825 Rename fig to compose
It's now at https://github.com/docker/compose

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: a6824ea7f2b22f7c3da11307c55acd04dac6505a
Component: engine
2015-03-04 16:35:56 +00:00
7bf2abf2b6 Missed to added doc files
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 7646e3f9574aabe7ebbd6eb8dc2ef0f4fcc4e3a9
Component: engine
2015-02-27 01:10:50 +10:00
d372e2ab22 update the mkdocs.yml to add new docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 6d4b0f53342f4b56ad0770bd0e1bce6fcd898a41
Component: engine
2015-02-26 12:11:29 +10:00
a1794f8b7d set the document meta-data for the orchestration docs to turn off the docker-version documentation dropdown, asit doesn't apply
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 0365e8c20422f96d14c6448218b02e59734e59ea
Component: engine
2015-02-26 11:41:39 +10:00
119882d0e4 Manually place the orchestration docs into the menu
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ac47a877403a894ac02724aaa111870edc7c2f8b
Component: engine
2015-02-26 11:41:39 +10:00
17fe06fc30 Don't require Docker 1.5.0 for docker build -f docs/Dockerfile
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 8d4459fffb5c1885b65506093538e059f0b51d90
Component: engine
2015-02-26 11:41:39 +10:00
824b119187 Import docs from swarm, machine and compose repositories,
Also add the image spec from the code area to show we're building from the repo-root now

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 3e84b9e56abdff7230e84a1830085c79c73aa3b7
Component: engine
2015-02-26 11:41:39 +10:00
593a99f129 Simplify the existing docs building by extracting the main Dockerfile into a docs/base Hub image
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ab545aed4c90134b33c9aab600ab2d18b6eafd73
Component: engine
2015-02-26 11:41:39 +10:00
e0ecebf764 remove swarm, machine and compose from the 1.5.0 release docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: a7a9ce2635e75eb138fc761d8a5bba4156562a8c
Component: engine
2015-02-05 10:30:57 +10:00
cfc914c811 use the same paths as in the swarm repo, so that their links magically work
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 1da2abb596178a3cb67ef83686f4425c31987640
Component: engine
2015-02-03 13:55:08 +10:00
7eb5278658 An initial quick import of documentation from Compose, Machine and Swarm
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 1b2032c82e344b918578ce2de3618597e36fd7d6
Component: engine
2015-01-19 14:23:39 +10:00
bafbcb6583 Add a note that remote and Boot2Docker users should not type sudo
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: d5df948829bfd6e12dc2c0ca3228b583386b6e87
Component: engine
2015-01-13 21:40:14 -05:00
f79466b12e Yes, the review really should have picked up this spelling mistake
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: bfe21f095d491dc9ee7e664b260239cbed8f505f
Component: engine
2014-10-31 11:10:17 +10:00
b2f795f224 Cleanup docs Dockerfile, so it matches best practices.
Docker-DCO-1.1-Signed-off-by: Joseph Ferguson <joe@infosiftr.com> (github: yosifkit)
Upstream-commit: 9a03652d9614e9d0a816bab2d2c672236d2d3d23
Component: engine
2014-10-27 09:35:27 -07:00
fd74b5fbc9 Fixed issue with docs not getting built due to ssl error.
Signed-off-by: Ken Cochrane <ken@docker.com>
Upstream-commit: 7f261ebe6cc60c01fd10f5f86f1c22d512be3f5f
Component: engine
2014-10-01 21:11:10 -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
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
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
b3754356a2 dynamically load a /versions.html_fragment file so that all old versions get the complete dropdown list of versions to select
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 5cd0f0824d04a73fb798207231b47157a51604d5
Component: engine
2014-07-21 15:51:14 +10:00
518e2ca12c add Docker version and branch to html header
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 5f6a7253321ffafdf84f53ea0253dd703b105c6b
Component: engine
2014-06-25 16:23:33 -07:00
61da490d61 pin awscli to 1.3.9, and then complexify the sync's to make them more likely to complete
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
Upstream-commit: 6b352d1cfe33cb3f5f64a3c18bb9931e9225adf8
Component: engine
2014-06-18 12:38:45 +10:00
57c8245b81 Give the Redirect a HostName - filled in from the s3 bucket name.
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: 0d59cc080a8dc115bdb727d376e3965e58109718
Component: engine
2014-05-12 10:31:27 +10:00
549ce4c50e remove rst/sphinx documentation
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: adf04681b4bd7293675b77b2397d87a5361b383b
Component: engine
2014-05-01 15:31:58 +10:00
9a6a4062e0 make the non-release doc warning conditional and add version info
use the beta-warning area to tell the user what VERSION of docker, git
branch, and links to the official release version docs are.

requires / extends PR #5272

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: dc982d3053bf46e03ad27c29d4662a9d5ba5e819
Component: engine
2014-04-23 21:07:12 +10:00
2a4849bb16 the markdown docs are now master, but I may do a manual conversion a few more times when older PR's are merged
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: d4a00c749440899c629a9f67b968295a4673c476
Component: engine
2014-04-18 16:34:53 +10:00
0bb55ea3f4 move the documentation to markdown
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: SvenDowideit)

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au> (github: )
Upstream-commit: 936a03bfddb24cd45f5f12c20a961bf2ae6ede93
Component: engine
2014-04-16 00:02:10 +00:00
4621ae86b1 Remove stackbrew prefix on ubuntu images now that they're reasonably up-to-date and stable
Everyone probably wants to run `docker pull ubuntu` before building with this change.

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f4a7c437769b5cf25d852d1aee6a6c50ee42fc85
Component: engine
2014-02-03 11:08:35 -07:00
1c3b8811ea Fix Travis build errors by bumping our python module versions to be newer
See also https://bitbucket.org/birkenfeld/sphinx/issue/1281/sphinx-113-not-build-proper-manpages

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 6ed9b06e072888d1e7bd60106f17371a89b668a4
Component: engine
2014-01-20 12:30:18 -07:00
0f4b49bea8 Fix odd issues with "make docs", add "make docs-shell", and canonicalize our docs Dockerfile a bit more
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: eaa9c85511620aa82f1876e1503604f591f00d23
Component: engine
2014-01-14 19:23:30 -07:00
bfbc1e39c3 Fix docs Dockerfile to install correctly again
Previously we've been getting:

```
Step 6 : RUN pip install Sphinx==1.1.3
 ---> Running in 397eab32f57a
 Wheel installs require setuptools >= 0.8 for dist-info support.
 pip's wheel support requires setuptools >= 0.8 for dist-info support.
 Storing debug log for failure in /.pip/pip.log
 2014/01/13 18:01:34 The command [/bin/sh -c pip install Sphinx==1.1.3] returned a non-zero code: 1
 make: *** [docs] Error 1
```

This fixes that by telling pip not to use sudo to install (since we're already root).

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 4087a643eaf6265f8d238caa2883348eeb5e908a
Component: engine
2014-01-13 18:22:23 -07:00
5c5c144532 Add daemon docs with selecting graph driver
Upstream-commit: d8f4b733f243a3da6cf5571f44b94b7109f326c4
Component: engine
2013-11-25 09:44:55 -08:00
5d5ae2293c add links to the Dockerfiles as canonical external requirements, add example of building and exposing the docs and simplify the Dockerfile for cacheability
Upstream-commit: e47f9984f8a2a250c980dd9325f6ac24a55093ed
Component: engine
2013-10-29 12:58:58 +10:00
a659202877 added a Dockerfile which installs all deps and builds the docs.
Upstream-commit: c6702bebe116054a4c24487b5fb5d2c26e9fad4f
Component: engine
2013-08-30 00:13:32 +00:00