From 9bef3c7cfaac7e618fd5baab15120c01db481b35 Mon Sep 17 00:00:00 2001 From: Alastair Smith Date: Mon, 3 Jun 2019 16:58:49 +0100 Subject: [PATCH 1/4] 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 9c695ca185..9113c496d4 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 a961160d4f..3ccf36deef 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 3026e9d31f..a94019fb16 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 From 101f2c55dd50e56af51c129a678fca0806f9ba3d Mon Sep 17 00:00:00 2001 From: Alastair Smith Date: Mon, 3 Jun 2019 17:43:04 +0100 Subject: [PATCH 2/4] tick versions in configs for ee 3.0 --- _config.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 9113c496d4..2670876930 100644 --- a/_config.yml +++ b/_config.yml @@ -120,6 +120,13 @@ defaults: - scope: path: "ee/dtr" values: + dtr_org: "docker" + dtr_repo: "dtr" + dtr_version: "2.7.0" + - scope: + path: "datacenter/dtr/2.6" + values: + hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" dtr_version: "2.6.6" @@ -165,15 +172,22 @@ defaults: values: ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "3.1.7" + ucp_version: "3.2.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.2.0" + dtr_version: "2.7.0" + - scope: + path: "datacenter/ucp/3.1" + values: + hide_from_sitemap: true + ucp_org: "docker" + ucp_repo: "ucp" ucp_version: "3.1.7" - dtr_version: "2.6.6" - scope: path: "datacenter/ucp/3.0" values: From fadf77e4208eb0b301246d3d84e5625579acf506 Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Mon, 10 Jun 2019 08:19:58 -0700 Subject: [PATCH 3/4] Change Engine API version to 1.40 --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 2670876930..c24f16ada2 100644 --- a/_config.yml +++ b/_config.yml @@ -19,7 +19,7 @@ exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks", "index.html", "404. # Component versions -- address like site.docker_ce_version # You can't have - characters in these for non-YAML reasons -latest_engine_api_version: "1.41" +latest_engine_api_version: "1.40" docker_ce_version: "19.03" docker_ee_version: "19.03" compose_version: "1.25.0" From e547834bb26c986db579c05aee48a2ad3c755958 Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Thu, 13 Jun 2019 10:22:38 -0700 Subject: [PATCH 4/4] Final touch-ups --- _config.yml | 3 +-- _data/docsarchive/archives.yaml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/_config.yml b/_config.yml index c24f16ada2..642d3cecd6 100644 --- a/_config.yml +++ b/_config.yml @@ -84,7 +84,6 @@ tablabels: 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 docker-cli-win: Docker CLI on Windows @@ -112,7 +111,7 @@ defaults: - scope: path: "install" values: - win_latest_build: "docker-18.09.6" + win_latest_build: "docker-19.03.0" - scope: path: "datacenter" values: diff --git a/_data/docsarchive/archives.yaml b/_data/docsarchive/archives.yaml index 3ccf36deef..a58c17ed68 100644 --- a/_data/docsarchive/archives.yaml +++ b/_data/docsarchive/archives.yaml @@ -1,6 +1,6 @@ - archive: name: v19.03 - image: docs/docs-private:latest + 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.