Updating with new tooling that supports GitHub source Markdown

Signed-off-by: Mary Anthony <mary@docker.com>
This commit is contained in:
Mary Anthony 2015-10-13 04:18:50 -07:00
parent 3fc52aa81d
commit f1a64ea23a
6 changed files with 54 additions and 69 deletions

View File

@ -1,4 +1,4 @@
FROM docs/base:latest FROM docs/base:hugo-github-linking
MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl) MAINTAINER Mary Anthony <mary@docker.com> (@moxiegirl)
# to get the git info for this repo # to get the git info for this repo
@ -6,22 +6,10 @@ COPY . /src
COPY . /docs/content/swarm/ COPY . /docs/content/swarm/
# Sed to process GitHub Markdown RUN svn checkout https://github.com/docker/docker/trunk/docs /docs/content/engine
# 1-2 Remove comment code from metadata block RUN svn checkout https://github.com/docker/compose/trunk/docs /docs/content/compose
# 3 Change ](/word to ](/project/ in links RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
# 4 Change ](word.md) to ](/project/word) RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry
# 5 Remove .md extension from link text RUN svn checkout https://github.com/kitematic/kitematic/trunk/docs /docs/content/kitematic
# 6 Change ](./ to ](/project/word) RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/tutorials
# 7 Change ](../../ to ](/project/ RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content
# 8 Change ](../ to ](/project/
#
RUN find /docs/content/swarm -type f -name "*.md" -exec sed -i.old \
-e '/^<!.*metadata]>/g' \
-e '/^<!.*end-metadata.*>/g' \
-e 's/\(\]\)\([(]\)\(\/\)/\1\2\/swarm\//g' \
-e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/swarm\/\2/g' \
-e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g' \
-e 's/\(\][(]\)\(\.\/\)/\1\/swarm\//g' \
-e 's/\(\][(]\)\(\.\.\/\.\.\/\)/\1\/swarm\//g' \
-e 's/\(\][(]\)\(\.\.\/\)/\1\/swarm\//g' {} \;

View File

@ -226,7 +226,7 @@ discovery README in the Docker Swarm repository</a>.
## Docker Swarm documentation index ## Docker Swarm documentation index
- [User guide](/) - [User guide]()
- [Scheduler strategies](/scheduler/strategy.md) - [Scheduler strategies](scheduler/strategy.md)
- [Scheduler filters](/scheduler/filter.md) - [Scheduler filters](scheduler/filter.md)
- [Swarm API](/api/swarm-api.md) - [Swarm API](api/swarm-api.md)

View File

@ -54,12 +54,12 @@ To dynamically configure and manage the services in your containers, you use a d
## Advanced Scheduling ## Advanced Scheduling
To learn more about advanced scheduling, see the To learn more about advanced scheduling, see the
[strategies](/scheduler/strategy) and [filters](/scheduler/filter.md) [strategies](scheduler/strategy.md) and [filters](scheduler/filter.md)
documents. documents.
## Swarm API ## Swarm API
The [Docker Swarm API](/api/swarm-api.md) is compatible with The [Docker Swarm API](api/swarm-api.md) is compatible with
the [Docker remote the [Docker remote
API](http://docs.docker.com/reference/api/docker_remote_api/), and extends it API](http://docs.docker.com/reference/api/docker_remote_api/), and extends it
with some new endpoints. with some new endpoints.

View File

@ -38,7 +38,7 @@ node with a discovery service. This example uses the token discovery
service hosted by Docker Hub. This discovery service associates a service hosted by Docker Hub. This discovery service associates a
token with instances of the Docker Daemon running on each node. Other token with instances of the Docker Daemon running on each node. Other
discovery service backends such as `etcd`, `consul`, and `zookeeper` discovery service backends such as `etcd`, `consul`, and `zookeeper`
are [available](/discovery). are [available](discovery.md).
1. List the machines on your system. 1. List the machines on your system.
@ -125,7 +125,7 @@ In this section, you create a swarm manager and two nodes.
2. Open your VirtualBox Manager, it should contain the `local` machine and the 2. Open your VirtualBox Manager, it should contain the `local` machine and the
new `swarm-master` machine. new `swarm-master` machine.
![VirtualBox](/images/virtual-box.png) ![VirtualBox](images/virtual-box.png)
3. Create a swarm node. 3. Create a swarm node.
@ -232,5 +232,5 @@ your swarm, and start an image on your swarm.
At this point, you've installed Docker Swarm by pulling the latest image of At this point, you've installed Docker Swarm by pulling the latest image of
it from Docker Hub. Then, you built and ran a swarm on your local machine it from Docker Hub. Then, you built and ran a swarm on your local machine
using VirtualBox. If you want, you can onto read an [overview of Docker Swarm using VirtualBox. If you want, you can onto read an [overview of Docker Swarm
features](/). Alternatively, you can develop a more in-depth view of Swarm by features](index.md). Alternatively, you can develop a more in-depth view of Swarm by
[manually installing Swarm](install-manual.md) on a network. [manually installing Swarm](install-manual.md) on a network.

View File

@ -406,7 +406,7 @@ This filter will prevent scheduling containers on unhealthy nodes.
## Docker Swarm documentation index ## Docker Swarm documentation index
- [User guide](/) - [User guide](../index.md)
- [Discovery options](/discovery/) - [Discovery options](../discovery.md)
- [Scheduler strategies](/scheduler/strategy/) - [Scheduler strategies](strategy.md)
- [Swarm API](/api/swarm-api) - [Swarm API](../api/swarm-api.md)

View File

@ -116,10 +116,7 @@ strategy prefers the node with most containers running.
## Docker Swarm documentation index ## Docker Swarm documentation index
- [User guide](../index.md)
- [User guide](/) - [Discovery options](../discovery.md)
- [Discovery options](/discovery/) - [Scheduler filters](filter.md)
- [Scheduler strategies](/scheduler/strategy) - [Swarm API](../api/swarm-api.md)
- [Scheduler filters](/scheduler/filter)
- [Swarm API](/api/swarm-api)