From 06e0673a7e8b35af5a69a3abe40ae8048a6cd1aa Mon Sep 17 00:00:00 2001 From: ollypom Date: Fri, 26 Oct 2018 17:21:17 +0100 Subject: [PATCH 1/3] Updated for October Patches Signed-off-by: ollypom --- _config.yml | 16 ++++++++-------- _data/ddc_offline_files_2.yaml | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/_config.yml b/_config.yml index 00069b631f..5e2998bbcd 100644 --- a/_config.yml +++ b/_config.yml @@ -92,7 +92,7 @@ defaults: - scope: path: "install" values: - win_latest_build: "docker-17.06.2-ee-16" + win_latest_build: "docker-17.06.2-ee-17" - scope: path: "datacenter" values: @@ -102,21 +102,21 @@ defaults: values: dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.5.5" + dtr_version: "2.5.6" - scope: path: "datacenter/dtr/2.4" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.4.6" + dtr_version: "2.4.7" - scope: path: "datacenter/dtr/2.3" values: hide_from_sitemap: true dtr_org: "docker" dtr_repo: "dtr" - dtr_version: "2.3.8" + dtr_version: "2.3.9" - scope: path: "datacenter/dtr/2.2" values: @@ -138,23 +138,23 @@ defaults: values: ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "3.0.5" + ucp_version: "3.0.6" - 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.0.5" + ucp_version: "3.0.6" dtr_version: "2.5.0" - dtr_latest_image: "docker/dtr:2.5.5" + dtr_latest_image: "docker/dtr:2.5.6" - scope: path: "datacenter/ucp/2.2" values: hide_from_sitemap: true ucp_org: "docker" ucp_repo: "ucp" - ucp_version: "2.2.13" + ucp_version: "2.2.14" - scope: path: "datacenter/ucp/2.1" values: diff --git a/_data/ddc_offline_files_2.yaml b/_data/ddc_offline_files_2.yaml index 1e4252ce24..458230376c 100644 --- a/_data/ddc_offline_files_2.yaml +++ b/_data/ddc_offline_files_2.yaml @@ -6,6 +6,16 @@ - product: "ucp" version: "3.0" tar-files: + - description: "3.0.6 Linux" + url: https://packages.docker.com/caas/ucp_images_3.0.6.tar.gz + - description: "3.0.6 IBM Z" + url: https://packages.docker.com/caas/ucp_images_s390x_3.0.6.tar.gz + - description: "3.0.6 Windows Server 2016 LTSC" + url: https://packages.docker.com/caas/ucp_images_win_2016_3.0.6.tar.gz + - description: "3.0.6 Windows Server 1709" + url: https://packages.docker.com/caas/ucp_images_win_1709_3.0.6.tar.gz + - description: "3.0.6 Windows Server 1803" + url: https://packages.docker.com/caas/ucp_images_win_1803_3.0.6.tar.gz - description: "3.0.5 Linux" url: https://packages.docker.com/caas/ucp_images_3.0.5.tar.gz - description: "3.0.5 IBM Z" @@ -53,6 +63,12 @@ - product: "ucp" version: "2.2" tar-files: + - description: "2.2.14 Linux" + url: https://packages.docker.com/caas/ucp_images_2.2.14.tar.gz + - description: "2.2.14 IBM Z" + url: https://packages.docker.com/caas/ucp_images_s390x_2.2.14.tar.gz + - description: "2.2.14 Windows" + url: https://packages.docker.com/caas/ucp_images_win_2.2.14.tar.gz - description: "2.2.13 Linux" url: https://packages.docker.com/caas/ucp_images_2.2.13.tar.gz - description: "2.2.13 IBM Z" @@ -128,6 +144,10 @@ - product: "dtr" version: "2.5" tar-files: + - description: "DTR 2.5.6 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.5.6.tar.gz + - description: "DTR 2.5.6 IBM Z" + url: https://packages.docker.com/caas/dtr_images_s390x_2.5.6.tar.gz - description: "DTR 2.5.5 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.5.5.tar.gz - description: "DTR 2.5.5 IBM Z" @@ -151,6 +171,10 @@ - product: "dtr" version: "2.4" tar-files: + - description: "DTR 2.4.7 Linux x86" + url: https://packages.docker.com/caas/dtr_images_2.4.7.tar.gz + - description: "DTR 2.4.7 IBM Z" + url: https://packages.docker.com/caas/dtr_images_s390x_2.4.7.tar.gz - description: "DTR 2.4.6 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.6.tar.gz - description: "DTR 2.4.6 IBM Z" @@ -182,6 +206,8 @@ - product: "dtr" version: "2.3" tar-files: + - description: "DTR 2.3.9" + 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 - description: "DTR 2.3.7" From 32f8a7d5ee70c7226b9f641845b6758b020f4a3d Mon Sep 17 00:00:00 2001 From: ollypom Date: Fri, 26 Oct 2018 18:22:32 +0100 Subject: [PATCH 2/3] Remove DTR IBM Z Links Signed-off-by: ollypom --- _data/ddc_offline_files_2.yaml | 28 ---------------------------- 1 file changed, 28 deletions(-) diff --git a/_data/ddc_offline_files_2.yaml b/_data/ddc_offline_files_2.yaml index 458230376c..0f9ba29f20 100644 --- a/_data/ddc_offline_files_2.yaml +++ b/_data/ddc_offline_files_2.yaml @@ -146,63 +146,35 @@ tar-files: - description: "DTR 2.5.6 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.5.6.tar.gz - - description: "DTR 2.5.6 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.5.6.tar.gz - description: "DTR 2.5.5 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.5.5.tar.gz - - description: "DTR 2.5.5 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.5.5.tar.gz - description: "DTR 2.5.3 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.5.3.tar.gz - - description: "DTR 2.5.3 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.5.3.tar.gz - description: "DTR 2.5.2 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.5.2.tar.gz - - description: "DTR 2.5.2 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.5.2.tar.gz - description: "DTR 2.5.1 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.5.1.tar.gz - - description: "DTR 2.5.1 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.5.1.tar.gz - description: "DTR 2.5.0 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.5.0.tar.gz - - description: "DTR 2.5.0 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.5.0.tar.gz - product: "dtr" version: "2.4" tar-files: - description: "DTR 2.4.7 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.7.tar.gz - - description: "DTR 2.4.7 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.4.7.tar.gz - description: "DTR 2.4.6 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.6.tar.gz - - description: "DTR 2.4.6 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.4.6.tar.gz - description: "DTR 2.4.5 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.5.tar.gz - - description: "DTR 2.4.5 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.4.5.tar.gz - description: "DTR 2.4.4 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.4.tar.gz - - description: "DTR 2.4.4 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.4.4.tar.gz - description: "DTR 2.4.3 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.3.tar.gz - - description: "DTR 2.4.3 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.4.3.tar.gz - description: "DTR 2.4.2 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.2.tar.gz - - description: "DTR 2.4.2 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.4.2.tar.gz - description: "DTR 2.4.1 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.1.tar.gz - - description: "DTR 2.4.1 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.4.1.tar.gz - description: "DTR 2.4.0 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.0.tar.gz - - description: "DTR 2.4.0 IBM Z" - url: https://packages.docker.com/caas/dtr_images_s390x_2.4.0.tar.gz - product: "dtr" version: "2.3" tar-files: From 5f535dd2aaf217bd552531100393875c36f248c1 Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Fri, 26 Oct 2018 13:19:31 -0700 Subject: [PATCH 3/3] Re-adding the offline packages for DTR 2.4. --- _data/ddc_offline_files_2.yaml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/_data/ddc_offline_files_2.yaml b/_data/ddc_offline_files_2.yaml index 0f9ba29f20..3ff6d9e6fd 100644 --- a/_data/ddc_offline_files_2.yaml +++ b/_data/ddc_offline_files_2.yaml @@ -163,18 +163,32 @@ url: https://packages.docker.com/caas/dtr_images_2.4.7.tar.gz - description: "DTR 2.4.6 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.6.tar.gz + - description: "DTR 2.4.6 IBM Z" + url: https://packages.docker.com/caas/dtr_images_s390x_2.4.6.tar.gz - description: "DTR 2.4.5 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.5.tar.gz + - description: "DTR 2.4.5 IBM Z" + url: https://packages.docker.com/caas/dtr_images_s390x_2.4.5.tar.gz - description: "DTR 2.4.4 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.4.tar.gz + - description: "DTR 2.4.4 IBM Z" + url: https://packages.docker.com/caas/dtr_images_s390x_2.4.4.tar.gz - description: "DTR 2.4.3 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.3.tar.gz + - description: "DTR 2.4.3 IBM Z" + url: https://packages.docker.com/caas/dtr_images_s390x_2.4.3.tar.gz - description: "DTR 2.4.2 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.2.tar.gz + - description: "DTR 2.4.2 IBM Z" + url: https://packages.docker.com/caas/dtr_images_s390x_2.4.2.tar.gz - description: "DTR 2.4.1 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.1.tar.gz + - description: "DTR 2.4.1 IBM Z" + url: https://packages.docker.com/caas/dtr_images_s390x_2.4.1.tar.gz - description: "DTR 2.4.0 Linux x86" url: https://packages.docker.com/caas/dtr_images_2.4.0.tar.gz + - description: "DTR 2.4.0 IBM Z" + url: https://packages.docker.com/caas/dtr_images_s390x_2.4.0.tar.gz - product: "dtr" version: "2.3" tar-files: