docker
diff --git a/‎.NOT_EDITED_HERE.yaml
Lines changed: 1 addition & 1 deletion b/‎.NOT_EDITED_HERE.yaml
Lines changed: 1 addition & 1 deletion
diff --git a/‎.dockerignore
Lines changed: 5 additions & 0 deletions b/‎.dockerignore
Lines changed: 5 additions & 0 deletions
diff --git a/‎.github/ISSUE_TEMPLATE.md
Lines changed: 3 additions & 2 deletions b/‎.github/ISSUE_TEMPLATE.md
Lines changed: 3 additions & 2 deletions
diff --git a/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 16 additions & 20 deletions b/‎.github/PULL_REQUEST_TEMPLATE.md
Lines changed: 16 additions & 20 deletions
diff --git a/‎.gitmodules
Lines changed: 13 additions & 0 deletions b/‎.gitmodules
Lines changed: 13 additions & 0 deletions
diff --git a/‎Dockerfile
Lines changed: 37 additions & 60 deletions b/‎Dockerfile
Lines changed: 37 additions & 60 deletions
diff --git a/‎Gemfile
Lines changed: 1 addition & 1 deletion b/‎Gemfile
Lines changed: 1 addition & 1 deletion
diff --git a/‎Jenkinsfile
Lines changed: 22 additions & 0 deletions b/‎Jenkinsfile
Lines changed: 22 additions & 0 deletions
diff --git a/‎README.md
Lines changed: 42 additions & 11 deletions b/‎README.md
Lines changed: 42 additions & 11 deletions
diff --git a/‎_config.yml
Lines changed: 17 additions & 4 deletions b/‎_config.yml
Lines changed: 17 additions & 4 deletions
@@ -1 +1 @@
-_data/.NOT_EDITED_HERE.yaml
+_data/not_edited_here.yaml
@@ -0,0 +1,5 @@
+.dockerignore
+.git
+.gitignore
+Dockerfile
+docker-compose.yml
@@ -1,7 +1,8 @@
 ### Problem description
 
-<!-- Briefly describe the problem that you found. Only documentation issues should be filed here. 
-     For general questions, go to https://forums.docker.com/. -->
+<!--Briefly describe the problem that you found.
+    Only DOCUMENTATION issues should be filed here.
+    For general questions, go to https://forums.docker.com/. -->
 
 ### Problem location
 
 
@@ -1,29 +1,25 @@
 <!--Thanks for your contribution. See [CONTRIBUTING](CONTRIBUTING.md)
-    for this project's contribution guidelines. -->
+    for this project's contribution guidelines. Remove these comments
+    as you go.
 
-<!--DO NOT edit files and directories listed in .NOT_EDITED_HERE.yaml.
-    These are maintained in upstream repos and changes here will be lost.-->
+    DO NOT edit files and directories listed in _data/not_edited_here.yaml.
+    These are maintained in upstream repos and changes here will be lost.
 
-### Describe the proposed changes
+    Help us merge your changes more quickly by adding details and setting metadata
+    (such as labels, milestones, and reviewers) over at the right-hand side.-->
 
-<!-- Tell us what you did and why.-->
+### Proposed changes
 
-### Unreleased project version
+<!--Tell us what you did and why-->
 
-<!-- If this change only applies to an unreleased version of a project, note
-     that here and base your work on the `vnext-` branch for your project. -->
+### Unreleased project version (optional)
 
-### Related issue
+<!--If this change only applies to an unreleased version of a project, note
+    that here and base your work on the `vnext-` branch for your project. If
+    this doesn't apply to this PR, you can remove this whole section.
+    Set a milestone if appropriate. -->
 
-<!-- Refer to related PRs or issues: #1234, or 'Fixes #1234' or 'Closes #1234'. -->
+### Related issues (optional)
 
-### Related issue or PR in another project
-
-<!-- Full URLs to issues or pull requests in other Github projects -->
-
-### Please take a look
-
-<!-- At-mention specific individuals or groups, like @exampleuser123 -->
-
-
-<!-- To improve this template, edit .github/PULL_REQUEST_TEMPLATE.md. -->
+<!--Refer to related PRs or issues: #1234, or 'Fixes #1234' or 'Closes #1234'.
+    Or link to full URLs to issues or pull requests in other Github projects -->
@@ -0,0 +1,13 @@
+[submodule "tests/src/github.com/gdevillele/frontparser"]
+	path = tests/src/github.com/gdevillele/frontparser
+	url = https://github.com/gdevillele/frontparser.git
+	branch = f28e87c7b9dae139855b574e96f22822986249a8
+[submodule "tests/src/golang.org/x/net"]
+	path = tests/src/golang.org/x/net
+	url = https://go.googlesource.com/net
+	branch = 45e771701b814666a7eb299e6c7a57d0b1799e91
+[submodule "tests/src/gopkg.in/yaml.v2"]
+	path = tests/src/gopkg.in/yaml.v2
+	url = https://github.com/go-yaml/yaml.git
+	branch = a5b47d31c556af34a302ce5d659e6fea44d90de0
+
@@ -1,62 +1,39 @@
 FROM starefossen/github-pages
 
-RUN git clone https://www.github.com/docker/docker.github.io allv
-RUN jekyll build -s allv -d allvbuild
-
-RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.4
-RUN mkdir allvbuild/v1.4
-RUN jekyll build -s allv -d allvbuild/v1.4
-RUN find allvbuild/v1.4 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.4/#g'
-RUN find allvbuild/v1.4 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.4/#g'
-RUN find allvbuild/v1.4 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.4/#g'
-
-RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.5
-RUN mkdir allvbuild/v1.5
-RUN jekyll build -s allv -d allvbuild/v1.5
-RUN find allvbuild/v1.5 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.5/#g'
-RUN find allvbuild/v1.5 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.5/#g'
-RUN find allvbuild/v1.5 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.5/#g'
-
-RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.6
-RUN mkdir allvbuild/v1.6
-RUN jekyll build -s allv -d allvbuild/v1.6
-RUN find allvbuild/v1.6 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.6/#g'
-RUN find allvbuild/v1.6 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.6/#g'
-RUN find allvbuild/v1.6 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.6/#g'
-
-RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.7
-RUN mkdir allvbuild/v1.7
-RUN jekyll build -s allv -d allvbuild/v1.7
-RUN find allvbuild/v1.7 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.7/#g'
-RUN find allvbuild/v1.7 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.7/#g'
-RUN find allvbuild/v1.7 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.7/#g'
-
-RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.8
-RUN mkdir allvbuild/v1.8
-RUN jekyll build -s allv -d allvbuild/v1.8
-RUN find allvbuild/v1.8 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.8/#g'
-RUN find allvbuild/v1.8 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.8/#g'
-RUN find allvbuild/v1.8 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.8/#g'
-
-RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.9
-RUN mkdir allvbuild/v1.9
-RUN jekyll build -s allv -d allvbuild/v1.9
-RUN find allvbuild/v1.9 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.9/#g'
-RUN find allvbuild/v1.9 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.9/#g'
-RUN find allvbuild/v1.9 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.9/#g'
-
-RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.10
-RUN mkdir allvbuild/v1.10
-RUN jekyll build -s allv -d allvbuild/v1.10
-RUN find allvbuild/v1.10 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.10/#g'
-RUN find allvbuild/v1.10 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.10/#g'
-RUN find allvbuild/v1.10 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.10/#g'
-
-RUN git --git-dir=./allv/.git --work-tree=./allv checkout v1.11
-RUN mkdir allvbuild/v1.11
-RUN jekyll build -s allv -d allvbuild/v1.11
-RUN find allvbuild/v1.11 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/v1.11/#g'
-RUN find allvbuild/v1.11 -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/v1.11/#g'
-RUN find allvbuild/v1.11 -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/v1.11/#g'
-
-CMD jekyll serve -s /usr/src/app/allvbuild -d /_site --no-watch -H 0.0.0.0 -P 4000
+ENV VERSIONS="v1.4 v1.5 v1.6 v1.7 v1.8 v1.9 v1.10 v1.11"
+
+# Create archive; check out each version, create HTML, tweak links
+RUN git clone https://www.github.com/docker/docker.github.io temp; \
+ for VER in $VERSIONS; do \
+		git --git-dir=./temp/.git --work-tree=./temp checkout ${VER} \
+		&& mkdir -p allvbuild/${VER} \
+		&& jekyll build -s temp -d allvbuild/${VER} \
+		&& find allvbuild/${VER} -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="/#href="/'"$VER"'/#g' \
+		&& find allvbuild/${VER} -type f -name '*.html' -print0 | xargs -0 sed -i 's#src="/#src="/'"$VER"'/#g' \
+		&& find allvbuild/${VER} -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/'"$VER"'/#g'; \
+	done; \
+	rm -rf temp
+
+COPY . allv
+
+## Branch to pull from, per ref doc
+ENV ENGINE_BRANCH="1.13.x"
+ENV DISTRIBUTION_BRANCH="release/2.5"
+
+# The statements below pull reference docs from upstream locations,
+# then build the whole site to static HTML using Jekyll
+
+RUN svn co https://github.com/docker/docker/branches/$ENGINE_BRANCH/docs/extend allv/engine/extend \
+ && wget -O allv/engine/deprecated.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/deprecated.md \
+ && svn co https://github.com/docker/distribution/branches/$DISTRIBUTION_BRANCH/docs/spec allv/registry/spec \
+ && wget -O allv/registry/configuration.md https://raw.githubusercontent.com/docker/distribution/$DISTRIBUTION_BRANCH/docs/configuration.md \
+ && rm -rf allv/apidocs/cloud-api-source \
+ && rm -rf allv/tests \
+ && wget -O allv/engine/api/v1.25/swagger.yaml https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/api/swagger.yaml \
+ && jekyll build -s allv -d allvbuild \
+ && find allvbuild/engine/reference -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/#g' \
+ && find allvbuild/engine/extend -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/#g' \
+ && rm -rf allv
+
+# Serve the site, which is now all static HTML
+CMD jekyll serve -s /usr/src/app/allvbuild --no-watch -H 0.0.0.0 -P 4000
@@ -1,3 +1,3 @@
 source "https://rubygems.org"
 
-gem "github-pages", "104" #Update me once in a while: https://github.com/github/pages-gem/releases
+gem "github-pages", "105" #Update me once in a while: https://github.com/github/pages-gem/releases
@@ -0,0 +1,22 @@
+wrappedNode(label: 'linux && x86_64') {
+  deleteDir()
+  stage "checkout"
+  checkout scm
+  sh "git submodule update --init --recursive"
+  stage "test"
+
+  /* Jekyll creates html files to implement client side redirects.
+    There are absolute links to docs.docker.com in these htmls
+    we don't want them to be parsed by the tests for now.
+    Removing jekyll-redirect-from option will make sure these pages
+    are not generated when building with Jekyll. */
+  sh "awk '/jekyll-redirect-from/{n=1}; n {n--; next}; 1' < _config.yml > _config.yml.tmp"
+  sh "mv _config.yml.tmp _config.yml"
+
+  sh "docker build -t docs:${JOB_BASE_NAME}-${BUILD_NUMBER} `pwd`"
+  sh "docker build -t tests:${JOB_BASE_NAME}-${BUILD_NUMBER} `pwd`/tests"
+  sh "docker run -v /usr/src/app/allvbuild --name docs-${JOB_BASE_NAME}-${BUILD_NUMBER} docs:${JOB_BASE_NAME}-${BUILD_NUMBER} /bin/true"
+  sh "docker run --rm --volumes-from docs-${JOB_BASE_NAME}-${BUILD_NUMBER} -v `pwd`:/docs tests:${JOB_BASE_NAME}-${BUILD_NUMBER}"
+  sh "docker rm -fv docs-${JOB_BASE_NAME}-${BUILD_NUMBER}"
+  sh "docker rmi docs:${JOB_BASE_NAME}-${BUILD_NUMBER} tests:${JOB_BASE_NAME}-${BUILD_NUMBER}"
+}
@@ -1,23 +1,23 @@
 # Docs @ Docker
 
 Welcome to the repo for our documentation. This is the source for the URL
-served at https://docs.docker.com/.
+served at [https://docs.docker.com/](https://docs.docker.com/).
 
 Feel free to send us pull requests and file issues. Our docs are completely
 open source and we deeply appreciate contributions from our community!
 
 ## Providing feedback
 
 We really want your feedback, and we've made it easy. You can edit, rate, or
-file an issue at the bottom of every page on docs.docker.com.
+file an issue at the bottom of every page on [https://docs.docker.com/](https://docs.docker.com/).
 
 **Please only file issues about the documentation in this repository.** One way
 to think about this is that you should file a bug here if your issue is that you
 don't see something that should be in the docs, or you see something incorrect
 or confusing in the docs.
 
 - If your problem is a general question about how to configure or use Docker,
-  consider asking a question on https://forums.docker.com instead.
+  consider asking a question on [https://forums.docker.com](https://forums.docker.com) instead.
 
 - If you have an idea for a new feature or behavior change in a specific aspect
   of Docker, or have found a bug in part of Docker, please file that issue in
@@ -69,7 +69,7 @@ your work on that project's `vnext` branch.** These branches were created by
 cloning `master` and then importing a project's `master` branch's docs into it
 (at the time of the migration), in a way that preserved the commit history. When
 a project has a release, its `vnext` branch will be merged into `master` and your
-work will be visible on docs.docker.com.
+work will be visible on [https://docs.docker.com/](https://docs.docker.com/).
 
 The following `vnext` branches currently exist:
 
@@ -101,15 +101,15 @@ The following `vnext` branches currently exist:
   docs for upcoming features in the [docker/kitematic](https://github.com/docker/kitematic/)
   project
 
-## Per-PR staging on Github
+## Per-PR staging on GitHub
 
 For every PR against `master` and all the long-lived branches, a staged version
 of the site is built using Netlify. If the site builds, you will see
 **deploy/netlify — Deploy preview ready**. Otherwise, you will see an error.
 Click **Details** to review the staged site or the errors that prevented it from
 building. Review the staged site and amend your commit if necessary. Reviewers
 will also check the staged site before merging the PR, to protect the integrity
-of [docs.docker.com](http://docs.docker.com/).
+of [https://docs.docker.com/](https://docs.docker.com/).
 
 ## Staging locally
 
@@ -136,10 +136,41 @@ You have three options:
     docker-compose down
     ```
 
-2.  Use Jekyll directly. Clone this repo, [install Ruby 2.3 or higher
-    (required)](https://www.ruby-lang.org/en/documentation/installation/),
-    [install the GitHub Pages Ruby gem](https://help.github.com/articles/setting-up-your-github-pages-site-locally-with-jekyll/),
-    then run `jekyll serve` from within the directory.
+2.  Use Jekyll directly. 
+
+    a. Clone this repo by running:
+
+       ```bash
+       git clone https://github.com/docker/docker.github.io.git
+       ```
+ 
+    b. Install Ruby 2.3 or later as described in [Installing Ruby]
+    (https://www.ruby-lang.org/en/documentation/installation/).
+    
+    c. Install Bundler:
+
+       ```bash
+       gem install bundler
+       ```
+       
+    d. If you use Ubuntu, install packages required for the Nokogiri HTML
+       parser:
+
+       ```bash
+       sudo apt-get install ruby-dev zlib1g-dev liblzma-dev
+       ```
+
+    e. Install Jekyll and other required dependencies:
+
+       ```bash
+       bundle install
+       ```
+    
+       >**Note**: You may have to install some packages manually.   
+
+    f. Change the directory to `docker.github.io`.
+
+    g. Use the `jekyll serve` command to continuously build the HTML output.
 
     The `jekyll serve` process runs in the foreground, and starts a web server
     running on http://localhost:4000/ by default. To stop it, use `CTRL+C`.
@@ -162,7 +193,7 @@ You have three options:
 
 Feel free to link to `../foo.md` so that the docs are readable in GitHub, but keep in mind that Jekyll templating notation
 `{% such as this %}` will render in raw text and not be processed. In general it's best to assume the docs are being read
-directly on docs.docker.com.
+directly on [https://docs.docker.com/](https://docs.docker.com/).
 
 ## Style guide
 
 
@@ -10,6 +10,7 @@ permalink: pretty
 safe: false
 lsi: false
 url: https://docs.docker.com
+keep_files: ["v1.4", "v1.5", "v1.6", "v1.7", "v1.8", "v1.9", "v1.10", "v1.11"]
 
 gems:
   - jekyll-redirect-from
@@ -87,20 +88,32 @@ defaults:
       path: "toolbox"
     values:
       assignee: "londoncalling"
+  -
+    scope:
+      path: "datacenter/dtr/2.1"
+    values:
+      ucp_version: "2.0"
+      dtr_version: "2.1"
   -
     scope:
       path: "datacenter/dtr/2.0"
     values:
       hide_from_sitemap: true
-      this_version: "2.0"
-      latest_version: "2.1"
+      ucp_version: "1.1"
+      dtr_version: "2.0"
+  -
+    scope:
+      path: "datacenter/ucp/2.0"
+    values:
+      ucp_version: "2.0"
+      dtr_version: "2.1"
   -
     scope:
       path: "datacenter/ucp/1.1"
     values:
       hide_from_sitemap: true
-      this_version: "1.1"
-      latest_version: "2.0"
+      ucp_version: "1.1"
+      dtr_version: "2.0"
   -
     scope:
       path: "apidocs/v1.3.3"
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-_data/.NOT_EDITED_HERE.yaml`
	`1`	`+_data/not_edited_here.yaml`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`source "https://rubygems.org"`
`2`	`2`
`3`		`-gem "github-pages", "104" #Update me once in a while: https://github.com/github/pages-gem/releases`
	`3`	`+gem "github-pages", "105" #Update me once in a while: https://github.com/github/pages-gem/releases`