Merge branch 'master' into newsite-tabs

.dockerignore

@@ -3,3 +3,4 @@
 .gitignore
 Dockerfile
 docker-compose.yml
+_site

Dockerfile

@@ -1,52 +1,45 @@
-FROM starefossen/github-pages
+FROM docs/docker.github.io:docs-base
 
-ENV VERSIONS="v1.4 v1.5 v1.6 v1.7 v1.8 v1.9 v1.10 v1.11 v1.12"
+# docs-base contains: GitHub Pages, nginx, and the docs archives, running on
+# Debian Jesse. See the contents of docs-base at:
+# https://github.com/docker/docker.github.io/tree/docs-base
 
-# 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 master into target directory (skipping files / folders in .dockerignore)
+# These files represent the current docs
+COPY . md_source
 
-COPY . allv
+# Move built html into md_source directory so we can reuse the target directory
+# to hold the static output.
+# Pull reference docs from upstream locations, then build the master docs
+# into static HTML in the "target" directory using Jekyll
+# then nuke the md_source directory.
 
 ## 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/api/v1.18.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.18.md \
- && wget -O allv/engine/api/v1.19.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.19.md \
- && wget -O allv/engine/api/v1.20.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.20.md \
- && wget -O allv/engine/api/v1.21.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.21.md \
- && wget -O allv/engine/api/v1.22.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.22.md \
- && wget -O allv/engine/api/v1.23.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.23.md \
- && wget -O allv/engine/api/v1.24.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.24.md \
- && wget -O allv/engine/api/version-history.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/version-history.md \
- && wget -O allv/engine/reference/glossary.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/reference/glossary.md \
- && wget -O allv/engine/reference/builder.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/reference/builder.md \
- && wget -O allv/engine/reference/run.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/reference/run.md \
- && wget -O allv/engine/reference/commandline/cli.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/reference/commandline/cli.md \
- && 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 \
- && rm allv/registry/spec/api.md.tmpl \
- && 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 \
- && rm -rf allvbuild/apidocs/layouts \
- && find allvbuild -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
+RUN svn co https://github.com/docker/docker/branches/$ENGINE_BRANCH/docs/extend md_source/engine/extend \
+ && wget -O md_source/engine/api/v1.18.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.18.md \
+ && wget -O md_source/engine/api/v1.19.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.19.md \
+ && wget -O md_source/engine/api/v1.20.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.20.md \
+ && wget -O md_source/engine/api/v1.21.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.21.md \
+ && wget -O md_source/engine/api/v1.22.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.22.md \
+ && wget -O md_source/engine/api/v1.23.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.23.md \
+ && wget -O md_source/engine/api/v1.24.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/v1.24.md \
+ && wget -O md_source/engine/api/version-history.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/api/version-history.md \
+ && wget -O md_source/engine/reference/glossary.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/reference/glossary.md \
+ && wget -O md_source/engine/reference/builder.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/reference/builder.md \
+ && wget -O md_source/engine/reference/run.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/reference/run.md \
+ && wget -O md_source/engine/reference/commandline/cli.md https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/docs/reference/commandline/cli.md \
+ && wget -O md_source/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 md_source/registry/spec \
+ && rm md_source/registry/spec/api.md.tmpl \
+ && wget -O md_source/registry/configuration.md https://raw.githubusercontent.com/docker/distribution/$DISTRIBUTION_BRANCH/docs/configuration.md \
+ && rm -rf md_source/apidocs/cloud-api-source \
+ && rm -rf md_source/tests \
+ && wget -O md_source/engine/api/v1.25/swagger.yaml https://raw.githubusercontent.com/docker/docker/v1.13.0/api/swagger.yaml \
+ && wget -O md_source/engine/api/v1.26/swagger.yaml https://raw.githubusercontent.com/docker/docker/$ENGINE_BRANCH/api/swagger.yaml \
+ && jekyll build -s md_source -d target \
+ && rm -rf target/apidocs/layouts \
+ && find target -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/#g' \
+ && rm -rf md_source

Gemfile

@@ -1,3 +1,6 @@
 source "https://rubygems.org"
 
-gem "github-pages", "105" #Update me once in a while: https://github.com/github/pages-gem/releases
+# Update me once in a while: https://github.com/github/pages-gem/releases
+# Please ensure, before upgrading, that this version exists as a tag in starefossen/github-pages here:
+# https://hub.docker.com/r/starefossen/github-pages/tags/
+gem "github-pages", "112"

_config.yml

@@ -11,7 +11,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"]
+keep_files: ["v1.4", "v1.5", "v1.6", "v1.7", "v1.8", "v1.9", "v1.10", "v1.11", "v1.12"]
 
 gems:
  - jekyll-redirect-from
@@ -48,7 +48,7 @@ defaults:
  - scope:
  path: "docker-cloud"
  values:
- assignee: "sanscontext"
+ assignee: "londoncalling"
  - scope:
  path: "docker-for-mac"
  values:
@@ -60,7 +60,7 @@ defaults:
  - scope:
  path: "docker-hub"
  values:
- assignee: "sanscontext"
+ assignee: "johndmulhausen"
  - scope:
  path: "docker-store"
  values:
@@ -93,10 +93,24 @@ defaults:
  path: "toolbox"
  values:
  assignee: "londoncalling"
+ -
+ scope:
+ path: "datacenter"
+ values:
+ ucp_latest_image: "docker/ucp:2.1.0"
+ dtr_latest_image: "docker/dtr:2.2.0"
+ -
+ scope:
+ path: "datacenter/dtr/2.2"
+ values:
+ ucp_version: "2.1"
+ dtr_version: "2.2"
+ docker_image: "docker/dtr:2.2.1"
  -
  scope:
  path: "datacenter/dtr/2.1"
  values:
+ hide_from_sitemap: true
  ucp_version: "2.0"
  dtr_version: "2.1"
  -
@@ -106,10 +120,18 @@ defaults:
  hide_from_sitemap: true
  ucp_version: "1.1"
  dtr_version: "2.0"
+ -
+ scope:
+ path: "datacenter/ucp/2.1"
+ values:
+ ucp_version: "2.1"
+ dtr_version: "2.2"
+ docker_image: "docker/ucp:2.1.0"
  -
  scope:
  path: "datacenter/ucp/2.0"
  values:
+ hide_from_sitemap: true
  ucp_version: "2.0"
  dtr_version: "2.1"
  -

_data/advisories.yaml

@@ -15,7 +15,7 @@ texts:
  toolbox: "**Legacy desktop solution.** Docker Toolbox is for older Mac and Windows systems that do not meet the requirements of [Docker for Mac](/docker-for-mac/) and [Docker for Windows](/docker-for-windows/). We recommend updating to the newer applications, if possible."
  kitematic: "**Legacy desktop solution.** Kitematic is a legacy solution, bundled with [Docker Toolbox](/toolbox/overview/). We recommend updating to [Docker for Mac](/docker-for-mac/) or [Docker for Windows](/docker-for-windows/) if your system meets the requirements for one of those applications."
  swarm: "See [Swarm mode overview](/engine/swarm/) for the orchestration features introduced in Docker Engine 1.12. Only refer to the Docker Swarm documents below for information on the standalone Swarm product."
- swarm-standalone: "**You are viewing docs for legacy standalone Swarm.** These topics describe standalone Docker Swarm. If you use Docker 1.12 or higher, [Swarm mode](/engine/swarm/) is integrated with Docker Engine. Most users should use integrated Swarm mode — a good place to start is [Getting started with swarm mode](/engine/swarm/swarm-tutorial/) and [Swarm mode CLI commands](/engine/swarm/index.md#swarm-mode-cli-commands). Standalone Docker Swarm is not integrated into the Docker Engine API and CLI commands."
+ swarm-standalone: "**You are viewing docs for legacy standalone Swarm.** These topics describe standalone Docker Swarm. In Docker 1.12 and higher, [Swarm mode](/engine/swarm/) is integrated with Docker Engine. Most users should use integrated Swarm mode — a good place to start is [Getting started with swarm mode](/engine/swarm/swarm-tutorial/), [Swarm mode CLI commands](/engine/swarm/index.md#swarm-mode-cli-commands), and the advanced [Learn Docker sample app](/engine/getstarted-voting-app/). Standalone Docker Swarm is not integrated into the Docker Engine API and CLI commands."
  engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker for Mac and Docker for Windows are currently in Beta."
 
 

_data/ddc_offline_files.yaml

@@ -4,8 +4,18 @@
 
 # Used by _includes/components/ddc_url_list.html
 
+- ucp-version: "2.1"
+ tar-files:
+ - description: "UCP 2.1.0"
+ url: https://packages.docker.com/caas/ucp_images_2.1.0.tar.gz
+ - description: "DTR 2.2.1"
+ url: https://packages.docker.com/caas/dtr-2.2.1.tar.gz
+ - description: "DTR 2.2.0"
+ url: https://packages.docker.com/caas/dtr-2.2.0.tar.gz
 - ucp-version: "2.0"
  tar-files:
+ - description: "UCP 2.0.3"
+ url: https://packages.docker.com/caas/ucp_images_2.0.3.tar.gz
  - description: "UCP 2.0.2"
  url: https://packages.docker.com/caas/ucp_images_2.0.2.tar.gz
  - description: "DTR 2.1.4"