1. docker
  2. Commit 8b09f8a302eaf7d73015112a774010e57e7f2c25
Browse code

Fixes after release Adding in a link about the deprecated material Fixing bad link to staging

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

Mary Anthony authored on 2015/08/12 14:30:50
Showing 4 changed files
docs/Dockerfile
History View file @ 8b09f8a
... ... 
@@ -6,8 +6,24 @@ COPY . /src
6 6
7 7 
 COPY . /docs/content/
8 8
9 
-WORKDIR /docs/content
9 
+RUN svn checkout https://github.com/docker/compose/trunk/docs /docs/content/compose
10 
+RUN svn checkout https://github.com/docker/swarm/trunk/docs /docs/content/swarm
11 
+RUN svn checkout https://github.com/docker/machine/trunk/docs /docs/content/machine
12 
+RUN svn checkout https://github.com/docker/distribution/trunk/docs /docs/content/registry
13 
+RUN svn checkout https://github.com/kitematic/kitematic/trunk/docs /docs/content/kitematic
14 
+RUN svn checkout https://github.com/docker/tutorials/trunk/docs /docs/content/
15 
+RUN svn checkout https://github.com/docker/opensource/trunk/docs /docs/content/opensource
10 16
11 
-RUN /docs/content/touch-up.sh
12 17
13 
-WORKDIR /docs
18 
+
19 
+
20 
+# Sed to process GitHub Markdown
21 
+# 1-2 Remove comment code from metadata block
22 
+# 3 Change ](/word to ](/project/ in links
23 
+# 4 Change ](word.md) to ](/project/word)
24 
+# 5 Remove .md extension from link text
25 
+# 6 Change ](../ to ](/project/word)
26 
+# 7 Change ](../../ to ](/project/ --> not implemented
27 
+#
28 
+#
29 
+RUN /src/pre-process.sh /docs
14 30 
\ No newline at end of file
docs/pre-process.sh
History View file @ 8b09f8a
15 31 
new file mode 100755
... ... 
@@ -0,0 +1,107 @@
0 
+#!/bin/bash -ex
1 
+
2 
+# Populate an array with just docker dirs and one with content dirs
3 
+content_dir=(`ls -d /docs/content/*`)
4 
+
5 
+# Loop content not of docker/
6 
+#
7 
+# Sed to process GitHub Markdown
8 
+# 1-2 Remove comment code from metadata block
9 
+# 3 Remove .md extension from link text
10 
+# 4 Change ](/ to ](/project/ in links
11 
+# 5 Change ](word) to ](/project/word)
12 
+# 6 Change ](../../ to ](/project/
13 
+# 7 Change ](../ to ](/project/word)
14 
+#
15 
+for i in "${content_dir[@]}"
16 
+do
17 
+   :
18 
+   case $i in
19 
+      "/docs/content/docker-trusted-registry")
20 
+      ;;
21 
+      "/docs/content/docker-hub")
22 
+      ;;
23 
+      "/docs/content/windows")
24 
+      ;;
25 
+      "/docs/content/mac")
26 
+      ;;
27 
+      "/docs/content/linux")
28 
+      ;;
29 
+      "/docs/content/registry")
30 
+      y=${i##*/}
31 
+      find $i -type f -name "*.md" -not -name "*.compare.md" -exec sed -i.old \
32 
+        -e '/^<!\(--\)\{0,1\}\[\(end-\)\{0,1\}metadata\]\(--\)\{0,1\}>/g' \
33 
+        -e 's/\(\][(]\)\(\.*\/\)*/\1/g' \
34 
+        -e 's/\(\][(]\)\([A-Za-z0-9_/-]\{1,\}\)\(\.md\)\{0,1\}\(#\{0,1\}\(#[A-Za-z0-9_-]*\)\{0,1\}\)[)]/\1\/'$y'\/\2\4)/g' \
35 
+        {} \;
36 
+      ;;
37 
+      "/docs/content/compose")
38 
+         y=${i##*/}
39 
+        find $i -type f -name "*.md" -exec sed -i.old \
40 
+        -e '/^<!.*metadata]>/g' \
41 
+        -e '/^<!.*end-metadata.*>/g' \
42 
+        -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/'$y'\//g' \
43 
+        -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/'$y'\/\2/g' \
44 
+        -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g'  \
45 
+        -e 's/\(\][(]\)\(\.\/\)/\1\/'$y'\//g' \
46 
+        -e 's/\(\][(]\)\(\.\.\/\.\.\/\)/\1\/'$y'\//g' \
47 
+        -e 's/\(\][(]\)\(\.\.\/\)/\1\/'$y'\//g' {} \;
48 
+      ;;
49 
+      "/docs/content/swarm")
50 
+         y=${i##*/}
51 
+         find $i -type f -name "*.md" -exec sed -i.old \
52 
+        -e '/^<!.*metadata]>/g' \
53 
+        -e '/^<!.*end-metadata.*>/g' \
54 
+        -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/'$y'\//g' \
55 
+        -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/'$y'\/\2/g' \
56 
+        -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g'  \
57 
+        -e 's/\(\][(]\)\(\.\/\)/\1\/'$y'\//g' \
58 
+        -e 's/\(\][(]\)\(\.\.\/\.\.\/\)/\1\/'$y'\//g' \
59 
+        -e 's/\(\][(]\)\(\.\.\/\)/\1\/'$y'\//g' {} \;
60 
+      ;;
61 
+      "/docs/content/machine")
62 
+         y=${i##*/}
63 
+        find $i -type f -name "*.md" -exec sed -i.old \
64 
+        -e '/^<!.*metadata]>/g' \
65 
+        -e '/^<!.*end-metadata.*>/g' \
66 
+        -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/'$y'\//g' \
67 
+        -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/'$y'\/\2/g' \
68 
+        -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g'  \
69 
+        -e 's/\(\][(]\)\(\.\/\)/\1\/'$y'\//g' \
70 
+        -e 's/\(\][(]\)\(\.\.\/\.\.\/\)/\1\/'$y'\//g' \
71 
+        -e 's/\(\][(]\)\(\.\.\/\)/\1\/'$y'\//g' {} \;
72 
+      ;;
73 
+      "/docs/content/kitematic")
74 
+         y=${i##*/}
75 
+        find $i -type f -name "*.md" -exec sed -i.old \
76 
+        -e '/^<!.*metadata]>/g' \
77 
+        -e '/^<!.*end-metadata.*>/g' \
78 
+        -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/'$y'\//g' \
79 
+        -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/'$y'\/\2/g' \
80 
+        -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g'  \
81 
+        -e 's/\(\][(]\)\(\.\/\)/\1\/'$y'\//g' \
82 
+        -e 's/\(\][(]\)\(\.\.\/\.\.\/\)/\1\/'$y'\//g' \
83 
+        -e 's/\(\][(]\)\(\.\.\/\)/\1\/'$y'\//g' {} \;
84 
+      ;;
85 
+      "/docs/content/opensource")
86 
+         y=${i##*/}
87 
+        find $i -type f -name "*.md" -exec sed -i.old \
88 
+        -e '/^<!.*metadata]>/g' \
89 
+        -e '/^<!.*end-metadata.*>/g' \
90 
+        -e 's/\(\]\)\([(]\)\(\/\)/\1\2\/'$y'\//g' \
91 
+        -e 's/\(\][(]\)\([A-z].*\)\(\.md\)/\1\/'$y'\/\2/g' \
92 
+        -e 's/\([(]\)\(.*\)\(\.md\)/\1\2/g'  \
93 
+        -e 's/\(\][(]\)\(\.\/\)/\1\/'$y'\//g' \
94 
+        -e 's/\(\][(]\)\(\.\.\/\.\.\/\)/\1\/'$y'\//g' \
95 
+        -e 's/\(\][(]\)\(\.\.\/\)/\1\/'$y'\//g' {} \;
96 
+      ;;
97 
+      *)
98 
+         y=${i##*/}
99 
+        find $i -type f -name "*.md" -exec sed -i.old \
100 
+        -e '/^<!.*metadata]>/g' \
101 
+        -e '/^<!.*end-metadata.*>/g' {} \;
102 
+      ;;
103 
+      esac
104 
+done
105 
+
106 
+
docs/reference/api/hub_registry_spec.md
History View file @ 8b09f8a
0 107 
new file mode 100644
... ... 
@@ -0,0 +1,17 @@
0 
+<!--[metadata]>
1 
+title = "The Docker Hub and the Registry v1"
2 
+description = "Documentation for docker Registry and Registry API"
3 
+keywords = ["docker, registry, api,  hub"]
4 
+[menu.main]
5 
+parent="smn_hub_ref"
6 
+<![end-metadata]-->
7 
+
8 
+# The Docker Hub and the Registry v1
9 
+
10 
+This API is deprecated as of 1.7. To view the old version, see the [go
11 
+here](http://docs.docker.com/v1.7/reference/api/hub_registry_spec/) in
12 
+the 1.7 documentation. If you want an overview of the current features in
13 
+Docker Hub or other image management features see the [image management
14 
+overview](/userguide/image_management/) in the current documentation set.
0 15 
\ No newline at end of file
docs/security/trust/trust_sandbox.md
History View file @ 8b09f8a
... ... 
@@ -15,7 +15,7 @@ The sandbox allows you to configure and try trust operations locally without
15 15 
 impacting your production images.
16 16
17 17 
 Before working through this sandbox, you should have read through the [trust
18 
-overview](content_trust.md).
18 
+overview](/security/trust/content_trust).
19 19
20 20 
 ### Prerequisites
21 21
... ... 
@@ -25,8 +25,8 @@ have `sudo` privileges on your local machine or in the VM.
25 25
26 26 
 This sandbox requires you to install two Docker tools: Docker Engine and Docker
27 27 
 Compose. To install the Docker Engine, choose from the [list of supported
28 
-platforms]({{< relref "installation.md" >}}). To install Docker Compose, see the
29 
-[detailed instructions here]({{< relref "compose/install" >}}).
28 
+platforms](/installation). To install Docker Compose, see the
29 
+[detailed instructions here](/compose/install).
30 30
31 31 
 Finally, you'll need to have `git` installed on your local system or VM.
32 32