Merge branch 'master' into consolidation-changes

Author: Jeffrey Morgan

Dockerfile

@@ -30,8 +30,8 @@ COPY . ${SOURCE}
 ## To get master from svn the svn branch needs to be 'trunk'. To get a branch from svn it needs to be 'branches/branchname'
 
 # Engine
-ENV ENGINE_SVN_BRANCH="branches/17.09.x"
-ENV ENGINE_BRANCH="17.09.x"
+ENV ENGINE_SVN_BRANCH="branches/18.09.x"
+ENV ENGINE_BRANCH="18.09.x"
 
 # Distribution
 ENV DISTRIBUTION_SVN_BRANCH="branches/release/2.6"
@@ -80,6 +80,7 @@ COPY --from=docs/docker.github.io:v17.03 ${TARGET} ${TARGET}
 COPY --from=docs/docker.github.io:v17.06 ${TARGET} ${TARGET}
 COPY --from=docs/docker.github.io:v17.09 ${TARGET} ${TARGET}
 COPY --from=docs/docker.github.io:v17.12 ${TARGET} ${TARGET}
+COPY --from=docs/docker.github.io:v18.03 ${TARGET} ${TARGET}
 
 # Get the built docs output from the previous build stage
 # This ordering means all previous layers can come from cache unless an archive

README.md

@@ -309,6 +309,13 @@ instance.  Be sure to compress the images *before* adding them to the
 repository, doing it afterwards actually worsens the impact on the Git repo (but
 still optimizes the bandwidth during browsing).
 
+## Beta content disclaimer
+```bash
+> BETA DISCLAIMER
+>
+> This is beta content. It is not yet complete and should be considered a work in progress. This content is subject to change without notice.
+```
+
 ## Building archives and the live published docs
 
 All the images described below are automatically built using Docker Hub. To

_config.yml

@@ -13,26 +13,28 @@ safe: false
 lsi: false
 url: https://docs.docker.com
 # This needs to have all the directories you expect to be in the archives (delivered by docs-base in the Dockerfile)
-keep_files: ["v1.4", "v1.5", "v1.6", "v1.7", "v1.8", "v1.9", "v1.10", "v1.11", "v1.12", "v1.13", "v17.03", "v17.06", "v17.09", "v17.12"]
+keep_files: ["v1.4", "v1.5", "v1.6", "v1.7", "v1.8", "v1.9", "v1.10", "v1.11", "v1.12", "v1.13", "v17.03", "v17.06", "v17.09", "v17.12", "v18.03"]
 exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks"]
 
 # Component versions -- address like site.docker_ce_stable_version
 # You can't have - characters in these for non-YAML reasons
 
-latest_stable_docker_engine_api_version: "1.37"
-docker_ce_stable_version: "18.03"
-docker_ce_edge_version: "18.05"
-docker_ee_version: "17.06"
+latest_stable_docker_engine_api_version: "1.39"
+docker_ce_stable_version: "18.09"
+docker_ce_edge_version: "18.09"
+docker_ee_version: "2.1"
 compose_version: "1.23.1"
-machine_version: "0.14.0"
+machine_version: "0.16.0"
 distribution_version: "2.6"
-dtr_version: "2.5"
-ucp_version: "3.0"
+dtr_version: "2.6"
+ucp_version: "3.1"
 
 ucp_versions:
-  - version: "3.0"
+  - version: "3.1"
     path: /ee/ucp/
     latest: true
+  - version: "3.0"
+    path: /datacenter/ucp/3.0/guides/
   - version: "2.2"
     path: /datacenter/ucp/2.2/guides/
   - version: "2.1"
@@ -43,9 +45,11 @@ ucp_versions:
     path: /datacenter/ucp/1.1/overview/
 
 dtr_versions:
-  - version: "2.5"
+  - version: "2.6"
     path: /ee/dtr/
     latest: true
+  - version: "2.5"
+    path: /datacenter/dtr/2.5/guides/
   - version: "2.4"
     path: /datacenter/dtr/2.4/guides/
   - version: "2.3"
@@ -58,7 +62,7 @@ dtr_versions:
     path: /datacenter/dtr/2.0/
 
 tablabels:
-  dee-2.0: Docker Enterprise Edition 2.0 Beta2
+  dee-2.0: Docker Enterprise Edition 2.0
   ucp-3.0: Universal Control Plane 3.0
   ucp-2.2: Universal Control Plane 2.2
   dtr-2.5: Docker Trusted Registry 2.5
@@ -80,8 +84,7 @@ plugins:
   - jekyll-sitemap
 
 defaults:
-  -
-    scope:
+  - scope:
       path: ""
       type: "pages"
     values:
@@ -100,6 +103,13 @@ defaults:
   - scope:
       path: "ee/dtr"
     values:
+      dtr_org: "docker"
+      dtr_repo: "dtr"
+      dtr_version: "2.6.0"
+  - scope:
+      path: "datacenter/dtr/2.5"
+    values:
+      hide_from_sitemap: true
       dtr_org: "docker"
       dtr_repo: "dtr"
       dtr_version: "2.5.6"
@@ -138,16 +148,23 @@ defaults:
     values:
       ucp_org: "docker"
       ucp_repo: "ucp"
-      ucp_version: "3.0.6"
+      ucp_version: "3.1.0"
   - scope: # This is a bit of a hack for the get-support.md topic.
       path: "ee"
     values:
       ucp_org: "docker"
       ucp_repo: "ucp"
       dtr_repo: "dtr"
+      ucp_version: "3.1.0"
+      dtr_version: "2.6.0"
+      dtr_latest_image: "docker/dtr:2.6.0"
+  - scope:
+      path: "datacenter/ucp/3.0"
+    values:
+      hide_from_sitemap: true
+      ucp_org: "docker"
+      ucp_repo: "ucp"
       ucp_version: "3.0.6"
-      dtr_version: "2.5.0"
-      dtr_latest_image: "docker/dtr:2.5.6"
   - scope:
       path: "datacenter/ucp/2.2"
     values:

_data/ddc_offline_files_2.yaml

@@ -3,6 +3,17 @@
 # environment that can't access the internet
 
 # Used by _includes/components/ddc_url_list_2.html
+- product: "ucp"
+  version: "3.1"
+  tar-files:
+    - description: "3.1.0 Linux"
+      url: https://packages.docker.com/caas/ucp_images_3.1.0.tar.gz
+    - description: "3.1.0 Windows Server 2016 LTSC"
+      url: https://packages.docker.com/caas/ucp_images_win_2016_3.1.0.tar.gz
+    - description: "3.1.0 Windows Server 1709"
+      url: https://packages.docker.com/caas/ucp_images_win_1709_3.1.0.tar.gz
+    - description: "3.1.0 Windows Server 1803"
+      url: https://packages.docker.com/caas/ucp_images_win_1803_3.1.0.tar.gz
 - product: "ucp"
   version: "3.0"
   tar-files:
@@ -74,19 +85,19 @@
     - description: "2.2.13 IBM Z"
       url: https://packages.docker.com/caas/ucp_images_s390x_2.2.13.tar.gz
     - description: "2.2.13 Windows"
-      url: https://packages.docker.com/caas/ucp_images_win_2.2.13.tar.gz  
+      url: https://packages.docker.com/caas/ucp_images_win_2.2.13.tar.gz
     - description: "2.2.12 Linux"
       url: https://packages.docker.com/caas/ucp_images_2.2.12.tar.gz
     - description: "2.2.12 IBM Z"
       url: https://packages.docker.com/caas/ucp_images_s390x_2.2.12.tar.gz
     - description: "2.2.12 Windows"
-      url: https://packages.docker.com/caas/ucp_images_win_2.2.12.tar.gz  
+      url: https://packages.docker.com/caas/ucp_images_win_2.2.12.tar.gz
     - description: "2.2.11 Linux"
       url: https://packages.docker.com/caas/ucp_images_2.2.11.tar.gz
     - description: "2.2.11 IBM Z"
       url: https://packages.docker.com/caas/ucp_images_s390x_2.2.11.tar.gz
     - description: "2.2.11 Windows"
-      url: https://packages.docker.com/caas/ucp_images_win_2.2.11.tar.gz  
+      url: https://packages.docker.com/caas/ucp_images_win_2.2.11.tar.gz
     - description: "2.2.10 Linux"
       url: https://packages.docker.com/caas/ucp_images_2.2.10.tar.gz
     - description: "2.2.10 IBM Z"
@@ -141,6 +152,11 @@
       url: https://packages.docker.com/caas/ucp_images_s390x_2.2.0.tar.gz
     - description: "2.2.0 Windows"
       url: https://packages.docker.com/caas/ucp_images_win_2.2.0.tar.gz
+- product: "dtr"
+  version: "2.6"
+  tar-files:
+    - description: "DTR 2.6.0 Linux x86"
+      url: https://packages.docker.com/caas/dtr_images_2.6.0.tar.gz
 - product: "dtr"
   version: "2.5"
   tar-files:
@@ -193,9 +209,9 @@
   version: "2.3"
   tar-files:
     - description: "DTR 2.3.9"
-      url: https://packages.docker.com/caas/dtr_images_2.3.9.tar.gz  
+      url: https://packages.docker.com/caas/dtr_images_2.3.9.tar.gz
     - description: "DTR 2.3.8"
-      url: https://packages.docker.com/caas/dtr_images_2.3.8.tar.gz  
+      url: https://packages.docker.com/caas/dtr_images_2.3.8.tar.gz
     - description: "DTR 2.3.7"
       url: https://packages.docker.com/caas/dtr_images_2.3.7.tar.gz
     - description: "DTR 2.3.6"
@@ -212,3 +228,4 @@
       url: https://packages.docker.com/caas/dtr-2.3.1.tar.gz
     - description: "DTR 2.3.0"
       url: https://packages.docker.com/caas/dtr-2.3.0.tar.gz
+

_data/docsarchive/archives.yaml

@@ -1,12 +1,15 @@
 - archive:
-  name: v18.03
+  name: v18.09
   image: docs/docker.github.io:latest
   current: true
 # When you make a new stable archive version, move the edge one to be second in
 # the list. The image for edge should be the same as latest.
 - archive:
   name: edge
   image: docs/docker.github.io:latest
+- archive:
+  name: v18.03
+  image: docs/docker.github.io:v18.03
 - archive:
   name: v17.12
   image: docs/docker.github.io:v17.12