From b776af5b1a3839b06164008a1ec6975ad8970dd9 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 18 Jul 2019 17:36:02 +0200 Subject: [PATCH 1/2] remove docker 1.12 17.03 from the torcx store Now that we exclude old versions of Docker, we should exclude Docker 1.12 & 17.03 from the torcx store. --- build_torcx_store | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build_torcx_store b/build_torcx_store index 22f3cfc01d..fdf1cbbea1 100755 --- a/build_torcx_store +++ b/build_torcx_store @@ -237,14 +237,13 @@ function torcx_package() { # for each package will point at the last version specified. This can handle # swapping default package versions for different OS releases by reordering. DEFAULT_IMAGES=( - =app-torcx/docker-1.12 =app-torcx/docker-18.09 ) # This list contains extra images which will be uploaded and included in the # generated manifest, but won't be included in the vendor store. EXTRA_IMAGES=( - =app-torcx/docker-17.03 + =app-torcx/docker-18.09 ) mkdir -p "${BUILD_DIR}" From dd2bdc6a7e53d6679792b56dc2972c02dfd00bc7 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 24 Jul 2019 21:56:24 +0200 Subject: [PATCH 2/2] remove unnecessary docker ebuild from torcx store Redundant docker entries in torcx stores caused strange conflicts between torcx hashes. --- build_torcx_store | 1 - 1 file changed, 1 deletion(-) diff --git a/build_torcx_store b/build_torcx_store index fdf1cbbea1..2470f72da3 100755 --- a/build_torcx_store +++ b/build_torcx_store @@ -243,7 +243,6 @@ DEFAULT_IMAGES=( # This list contains extra images which will be uploaded and included in the # generated manifest, but won't be included in the vendor store. EXTRA_IMAGES=( - =app-torcx/docker-18.09 ) mkdir -p "${BUILD_DIR}"