From c3780fa88610a548e2b3aa1873d0fbcd0a67537b Mon Sep 17 00:00:00 2001 From: Olly P Date: Thu, 29 Aug 2019 12:51:47 +0100 Subject: [PATCH] August Patch Offline Bundles (#1304) * Simplified EE variables in _config (#9260) Before we had 2 UCP configuration variables. 1 for pages under "ee" and 1 for pages under "ee/ucp". We had the same pattern for DTR. THis commit removes the variable at the ee/ucp level, in the hope that all files will take it from the /ee variable. * Added Offline Bundles and Bumped Config --- _config.yml | 39 +++++++++++++--------------------- _data/ddc_offline_files_2.yaml | 36 +++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 24 deletions(-) diff --git a/_config.yml b/_config.yml index f5e07694ed..77b4854621 100644 --- a/_config.yml +++ b/_config.yml @@ -111,38 +111,43 @@ defaults: - scope: path: "install" values: - win_latest_build: "docker-19.03.1" + win_latest_build: "docker-19.03.2" - scope: path: "datacenter" values: enterprise: true + # Latest Enterprise Platform Release - scope: - path: "ee/dtr" + path: "ee" values: + ucp_org: "docker" + ucp_repo: "ucp" dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.7.1" + ucp_version: "3.2.1" + dtr_version: "2.7.2" + # Previous DTR Releases - scope: path: "datacenter/dtr/2.6" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.6.8" + dtr_version: "2.6.9" - scope: path: "datacenter/dtr/2.5" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.5.13" + dtr_version: "2.5.14" - scope: path: "datacenter/dtr/2.4" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.4.13" + dtr_version: "2.4.14" - scope: path: "datacenter/dtr/2.3" values: @@ -166,42 +171,28 @@ defaults: values: ucp_version: "1.1" dtr_version: "2.0" - - scope: - path: "ee/ucp" - values: - ucp_org: "docker" - ucp_repo: "ucp" - ucp_version: "3.2.0" - - scope: # This is a bit of a hack for the get-support.md and /ee/admin/ - path: "ee" - values: - ucp_org: "docker" - ucp_repo: "ucp" - dtr_org: "docker" - dtr_repo: "dtr" - ucp_version: "3.2.0" - dtr_version: "2.7.1" + # Previous UCP Releases - scope: path: "datacenter/ucp/3.1" values: hide_from_sitemap: true ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "3.1.9" + ucp_version: "3.1.10" - scope: path: "datacenter/ucp/3.0" values: hide_from_sitemap: true ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "3.0.13" + ucp_version: "3.0.14" - scope: path: "datacenter/ucp/2.2" values: hide_from_sitemap: true ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "2.2.20" + ucp_version: "2.2.21" - scope: path: "datacenter/ucp/2.1" values: diff --git a/_data/ddc_offline_files_2.yaml b/_data/ddc_offline_files_2.yaml index 529ca2fefe..a025a83786 100644 --- a/_data/ddc_offline_files_2.yaml +++ b/_data/ddc_offline_files_2.yaml @@ -6,6 +6,12 @@ - product: "ucp" version: "3.2" tar-files: + - description: "3.2.1 Linux" + url: https://packages.docker.com/caas/ucp_images_3.2.1.tar.gz + - description: "3.2.1 Windows Server 2016 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2016_3.2.1.tar.gz + - description: "3.2.1 Windows Server 2019 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2019_3.2.1.tar.gz - description: "3.2.0 Linux" url: https://packages.docker.com/caas/ucp_images_3.2.0.tar.gz - description: "3.2.0 Windows Server 2016 LTSC" @@ -15,6 +21,14 @@ - product: "ucp" version: "3.1" tar-files: + - description: "3.1.10 Linux" + url: https://packages.docker.com/caas/ucp_images_3.1.10.tar.gz + - description: "3.1.10 Windows Server 2016 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2016_3.1.10.tar.gz + - description: "3.1.10 Windows Server 1803" + url: https://packages.docker.com/caas/ucp_images_win_1803_3.1.10.tar.gz + - description: "3.1.10 Windows Server 2019 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2019_3.1.10.tar.gz - description: "3.1.9 Linux" url: https://packages.docker.com/caas/ucp_images_3.1.9.tar.gz - description: "3.1.9 Windows Server 2016 LTSC" @@ -108,6 +122,14 @@ - product: "ucp" version: "3.0" tar-files: + - description: "3.0.14 Linux" + url: https://packages.docker.com/caas/ucp_images_3.0.14.tar.gz + - description: "3.0.14 IBM Z" + url: https://packages.docker.com/caas/ucp_images_s390x_3.0.14.tar.gz + - description: "3.0.14 Windows Server 2016 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.14.tar.gz + - description: "3.0.14 Windows Server 1803" + url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.14.tar.gz - description: "3.0.13 Linux" url: https://packages.docker.com/caas/ucp_images_3.0.13.tar.gz - description: "3.0.13 IBM Z" @@ -227,6 +249,12 @@ - product: "ucp" version: "2.2" tar-files: + - description: "2.2.21 Linux" + url: https://packages.docker.com/caas/ucp_images_2.2.21.tar.gz + - description: "2.2.21 IBM Z" + url: https://packages.docker.com/caas/ucp_images_s390x_2.2.21.tar.gz + - description: "2.2.21 Windows" + url: https://packages.docker.com/caas/ucp_images_win_2.2.21.tar.gz - description: "2.2.20 Linux" url: https://packages.docker.com/caas/ucp_images_2.2.20.tar.gz - description: "2.2.20 IBM Z" @@ -344,6 +372,8 @@ - product: "dtr" version: "2.7" tar-files: + - description: "DTR 2.7.2 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.7.2.tar.gz - description: "DTR 2.7.1 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.7.1.tar.gz - description: "DTR 2.7.0 Linux x86" @@ -351,6 +381,8 @@ - product: "dtr" version: "2.6" tar-files: + - description: "DTR 2.6.9 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.6.9.tar.gz - description: "DTR 2.6.8 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.6.8.tar.gz - description: "DTR 2.6.7 Linux x86" @@ -372,6 +404,8 @@ - product: "dtr" version: "2.5" tar-files: + - description: "DTR 2.5.14 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.5.14.tar.gz - description: "DTR 2.5.13 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.5.13.tar.gz - description: "DTR 2.5.12 Linux x86" @@ -401,6 +435,8 @@ - product: "dtr" version: "2.4" tar-files: + - description: "DTR 2.4.14 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.4.14.tar.gz - description: "DTR 2.4.13 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.13.tar.gz - description: "DTR 2.4.12 Linux x86"