From 9bef3c7cfaac7e618fd5baab15120c01db481b35 Mon Sep 17 00:00:00 2001 From: Alastair Smith Date: Mon, 3 Jun 2019 16:58:49 +0100 Subject: [PATCH] update configs for docker ee 3.0 --- _config.yml | 38 +++++++++++++++++++++++---------- _data/docsarchive/archives.yaml | 7 ++++-- robots.txt | 3 +++ 3 files changed, 35 insertions(+), 13 deletions(-) diff --git a/_config.yml b/_config.yml index 9c695ca1856..9113c496d47 100644 --- a/_config.yml +++ b/_config.yml @@ -13,27 +13,29 @@ 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: ["v17.03", "v17.06", "v17.09", "v17.12", "v18.03"] +keep_files: ["v17.03", "v17.06", "v17.09", "v17.12", "v18.03", "v18.09"] exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks", "index.html", "404.html"] # Component versions -- address like site.docker_ce_version # You can't have - characters in these for non-YAML reasons -latest_engine_api_version: "1.39" -docker_ce_version: "18.09" -docker_ee_version: "18.09" -compose_version: "1.24.0" +latest_engine_api_version: "1.41" +docker_ce_version: "19.03" +docker_ee_version: "19.03" +compose_version: "1.25.0" compose_file_v3: "3.7" compose_file_v2: "2.4" -machine_version: "0.16.0" -distribution_version: "2.6" -dtr_version: "2.6" -ucp_version: "3.1" +machine_version: "0.16.1" +distribution_version: "2.7.1" +dtr_version: "2.7" +ucp_version: "3.2" ucp_versions: - - version: "3.1" + - version: "3.2" path: /ee/ucp/ latest: true + - version: "3.1" + path: /datacenter/ucp/3.1/guides/ - version: "3.0" path: /datacenter/ucp/3.0/guides/ - version: "2.2" @@ -46,9 +48,11 @@ ucp_versions: path: /datacenter/ucp/1.1/overview/ dtr_versions: - - version: "2.6" + - version: "2.7" path: /ee/dtr/ latest: true + - version: "2.6" + path: /datacenter/dtr/2.6/guides/ - version: "2.5" path: /datacenter/dtr/2.5/guides/ - version: "2.4" @@ -63,11 +67,23 @@ dtr_versions: path: /datacenter/dtr/2.0/ tablabels: + dee-3.0: Docker Enterprise Edition 3.0 + dee-2.1: Docker Enterprise Edition 2.1 dee-2.0: Docker Enterprise Edition 2.0 + ucp-3.2: Universal Control Plane 3.2 + ucp-3.1: Universal Control Plane 3.1 ucp-3.0: Universal Control Plane 3.0 ucp-2.2: Universal Control Plane 2.2 + dtr-2.7: Docker Trusted Registry 2.7 + dtr-2.6: Docker Trusted Registry 2.6 dtr-2.5: Docker Trusted Registry 2.5 dtr-2.4: Docker Trusted Registry 2.4 + engine-19.03: Docker EE Engine 19.03 + engine-18.09: Docker EE Engine 18.09 + engine-18.03: Docker EE Engine 18.03 + engine-17.12: Docker EE Engine 17.12 + engine-17.09: Docker EE Engine 17.09 + engine-17.06: Docker EE Engine 17.06 engine-17.06: Docker EE Engine 17.06 engine-17.03: Docker EE Engine 17.03 docker-cli-linux: Docker CLI on Mac/Linux diff --git a/_data/docsarchive/archives.yaml b/_data/docsarchive/archives.yaml index a961160d4f8..3ccf36deeff 100644 --- a/_data/docsarchive/archives.yaml +++ b/_data/docsarchive/archives.yaml @@ -1,12 +1,15 @@ - archive: - name: v18.09 - image: docs/docker.github.io:latest + name: v19.03 + image: docs/docs-private: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.09 + image: docs/docker.github.io:v18.09 - archive: name: v18.03 image: docs/docker.github.io:v18.03 diff --git a/robots.txt b/robots.txt index 3026e9d31f9..a94019fb164 100644 --- a/robots.txt +++ b/robots.txt @@ -14,6 +14,7 @@ Disallow: /v1.13/ Disallow: /v17.03/ Disallow: /v17.06/ Disallow: /v18.03/ +Disallow: /v18.09/ # Docker Datacenter archives Disallow: /datacenter/dtr/2.0 @@ -22,7 +23,9 @@ Disallow: /datacenter/dtr/2.2 Disallow: /datacenter/dtr/2.3 Disallow: /datacenter/dtr/2.4 Disallow: /datacenter/dtr/2.5 +Disallow: /datacenter/dtr/2.6 +Disallow: /datacenter/ucp/3.1 Disallow: /datacenter/ucp/3.0 Disallow: /datacenter/ucp/2.1 Disallow: /datacenter/ucp/2.0