From cac3f100da0d4094c76e852c2e878fbab8e30a75 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Fri, 3 May 2019 10:11:10 -0400 Subject: [PATCH 01/11] WIP: Update opensuse images to leap from 42.3 --- release/stable/opensuse423/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/stable/opensuse423/docker/Dockerfile b/release/stable/opensuse423/docker/Dockerfile index 9a7f0e767..917b7eb61 100644 --- a/release/stable/opensuse423/docker/Dockerfile +++ b/release/stable/opensuse423/docker/Dockerfile @@ -4,7 +4,7 @@ # effectively removing the tar.gz and packages that are not needed from the final image. # Define arg(s) needed for the From statement -ARG fromTag=42.3 +ARG fromTag=leap ARG imageRepo=opensuse FROM ${imageRepo}:${fromTag} AS installer-env From 5c590b5b46ba954457238f0ef72f84a33739f2c0 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Fri, 3 May 2019 10:12:38 -0400 Subject: [PATCH 02/11] Update getLatestTag.ps1 --- release/stable/opensuse423/getLatestTag.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/stable/opensuse423/getLatestTag.ps1 b/release/stable/opensuse423/getLatestTag.ps1 index 3e41995f3..f7261fb17 100644 --- a/release/stable/opensuse423/getLatestTag.ps1 +++ b/release/stable/opensuse423/getLatestTag.ps1 @@ -4,7 +4,7 @@ # return objects representing the tags we need to base the opensuse image on Docker # The versions of opensuse we care about -$shortTags = @('42.3') +$shortTags = @('leap') $parent = Join-Path -Path $PSScriptRoot -ChildPath '..' $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..' From 2b55a6a275978f8a672a44f173364fcc43fc41ab Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Fri, 3 May 2019 10:14:33 -0400 Subject: [PATCH 03/11] Update Dockerfile --- release/preview/opensuse423/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/opensuse423/docker/Dockerfile b/release/preview/opensuse423/docker/Dockerfile index ca91cd8d3..dac5768a5 100644 --- a/release/preview/opensuse423/docker/Dockerfile +++ b/release/preview/opensuse423/docker/Dockerfile @@ -4,7 +4,7 @@ # effectively removing the tar.gz and packages that are not needed from the final image. # Define arg(s) needed for the From statement -ARG fromTag=42.3 +ARG fromTag=leap ARG imageRepo=opensuse FROM ${imageRepo}:${fromTag} AS installer-env From 956c4d9b7e036a53be2969d92987193b87ca9003 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Fri, 3 May 2019 10:14:59 -0400 Subject: [PATCH 04/11] Update getLatestTag.ps1 --- release/preview/opensuse423/getLatestTag.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/opensuse423/getLatestTag.ps1 b/release/preview/opensuse423/getLatestTag.ps1 index 3e41995f3..f7261fb17 100644 --- a/release/preview/opensuse423/getLatestTag.ps1 +++ b/release/preview/opensuse423/getLatestTag.ps1 @@ -4,7 +4,7 @@ # return objects representing the tags we need to base the opensuse image on Docker # The versions of opensuse we care about -$shortTags = @('42.3') +$shortTags = @('leap') $parent = Join-Path -Path $PSScriptRoot -ChildPath '..' $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..' From ddc5cb42a6bba943060677547296b195813f5f0e Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 3 May 2019 13:25:38 -0400 Subject: [PATCH 05/11] Update release/preview/opensuse423/docker/Dockerfile Co-Authored-By: RDIL --- release/preview/opensuse423/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/opensuse423/docker/Dockerfile b/release/preview/opensuse423/docker/Dockerfile index dac5768a5..a0fefcb32 100644 --- a/release/preview/opensuse423/docker/Dockerfile +++ b/release/preview/opensuse423/docker/Dockerfile @@ -5,7 +5,7 @@ # Define arg(s) needed for the From statement ARG fromTag=leap -ARG imageRepo=opensuse +ARG imageRepo=opensuse/leap FROM ${imageRepo}:${fromTag} AS installer-env From 2c139959db173b94a7ada7d4928d5acd34cd4f46 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Fri, 3 May 2019 13:26:05 -0400 Subject: [PATCH 06/11] Update Dockerfile --- release/preview/opensuse423/docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/opensuse423/docker/Dockerfile b/release/preview/opensuse423/docker/Dockerfile index a0fefcb32..c5dd8e378 100644 --- a/release/preview/opensuse423/docker/Dockerfile +++ b/release/preview/opensuse423/docker/Dockerfile @@ -4,7 +4,7 @@ # effectively removing the tar.gz and packages that are not needed from the final image. # Define arg(s) needed for the From statement -ARG fromTag=leap +ARG fromTag=42.3 ARG imageRepo=opensuse/leap FROM ${imageRepo}:${fromTag} AS installer-env From bdc54ca816371ea6c26fa2b4fb7693d79d6d2309 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Fri, 3 May 2019 13:26:28 -0400 Subject: [PATCH 07/11] Update getLatestTag.ps1 --- release/preview/opensuse423/getLatestTag.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/opensuse423/getLatestTag.ps1 b/release/preview/opensuse423/getLatestTag.ps1 index f7261fb17..cb41f1c94 100644 --- a/release/preview/opensuse423/getLatestTag.ps1 +++ b/release/preview/opensuse423/getLatestTag.ps1 @@ -11,4 +11,4 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags' Import-Module $modulePath -Get-DockerTags -ShortTags $shortTags -Image "opensuse" -FullTagFilter '^42.3$' -OnlyShortTags +Get-DockerTags -ShortTags $shortTags -Image "opensuse" -FullTagFilter '^leap$' -OnlyShortTags From 3ccabadae44387d93907025a07ef58f3b50bfd03 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Fri, 3 May 2019 13:26:46 -0400 Subject: [PATCH 08/11] Update getLatestTag.ps1 --- release/preview/opensuse423/getLatestTag.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/opensuse423/getLatestTag.ps1 b/release/preview/opensuse423/getLatestTag.ps1 index cb41f1c94..a70206061 100644 --- a/release/preview/opensuse423/getLatestTag.ps1 +++ b/release/preview/opensuse423/getLatestTag.ps1 @@ -4,7 +4,7 @@ # return objects representing the tags we need to base the opensuse image on Docker # The versions of opensuse we care about -$shortTags = @('leap') +$shortTags = @('42.3') $parent = Join-Path -Path $PSScriptRoot -ChildPath '..' $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..' From 3e5e9b02963ea7636b1ebe9d6b7a8c7ac16a3884 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Thu, 20 Jun 2019 21:06:22 -0400 Subject: [PATCH 09/11] Update release/stable/opensuse423/getLatestTag.ps1 Co-Authored-By: Travis Plunk --- release/stable/opensuse423/getLatestTag.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/stable/opensuse423/getLatestTag.ps1 b/release/stable/opensuse423/getLatestTag.ps1 index f7261fb17..3e41995f3 100644 --- a/release/stable/opensuse423/getLatestTag.ps1 +++ b/release/stable/opensuse423/getLatestTag.ps1 @@ -4,7 +4,7 @@ # return objects representing the tags we need to base the opensuse image on Docker # The versions of opensuse we care about -$shortTags = @('leap') +$shortTags = @('42.3') $parent = Join-Path -Path $PSScriptRoot -ChildPath '..' $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath '..' From 715d676e9735c9ef6c2e17dcf9c2fe32b09dddf6 Mon Sep 17 00:00:00 2001 From: Reece Dunham Date: Thu, 20 Jun 2019 21:06:31 -0400 Subject: [PATCH 10/11] Update release/preview/opensuse423/getLatestTag.ps1 Co-Authored-By: Travis Plunk --- release/preview/opensuse423/getLatestTag.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release/preview/opensuse423/getLatestTag.ps1 b/release/preview/opensuse423/getLatestTag.ps1 index a70206061..b4845d977 100644 --- a/release/preview/opensuse423/getLatestTag.ps1 +++ b/release/preview/opensuse423/getLatestTag.ps1 @@ -11,4 +11,4 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags' Import-Module $modulePath -Get-DockerTags -ShortTags $shortTags -Image "opensuse" -FullTagFilter '^leap$' -OnlyShortTags +Get-DockerTags -ShortTags $shortTags -Image "opensuse/leap" -FullTagFilter '^leap$' -OnlyShortTags From cf461d9cd3fcf535ac5398d3f92b5d992b9f4c19 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 21 Jun 2019 11:25:10 -0700 Subject: [PATCH 11/11] fix opensuse --- release/preview/opensuse423/getLatestTag.ps1 | 2 +- release/stable/opensuse423/docker/Dockerfile | 4 ++-- release/stable/opensuse423/getLatestTag.ps1 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/release/preview/opensuse423/getLatestTag.ps1 b/release/preview/opensuse423/getLatestTag.ps1 index b4845d977..9d3cfb58f 100644 --- a/release/preview/opensuse423/getLatestTag.ps1 +++ b/release/preview/opensuse423/getLatestTag.ps1 @@ -11,4 +11,4 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags' Import-Module $modulePath -Get-DockerTags -ShortTags $shortTags -Image "opensuse/leap" -FullTagFilter '^leap$' -OnlyShortTags +Get-DockerTags -ShortTags $shortTags -Image "opensuse/leap" -FullTagFilter '^42\.3$' -OnlyShortTags diff --git a/release/stable/opensuse423/docker/Dockerfile b/release/stable/opensuse423/docker/Dockerfile index 917b7eb61..2b68220cc 100644 --- a/release/stable/opensuse423/docker/Dockerfile +++ b/release/stable/opensuse423/docker/Dockerfile @@ -4,8 +4,8 @@ # effectively removing the tar.gz and packages that are not needed from the final image. # Define arg(s) needed for the From statement -ARG fromTag=leap -ARG imageRepo=opensuse +ARG fromTag=42.3 +ARG imageRepo=opensuse/leap FROM ${imageRepo}:${fromTag} AS installer-env diff --git a/release/stable/opensuse423/getLatestTag.ps1 b/release/stable/opensuse423/getLatestTag.ps1 index 3e41995f3..9d3cfb58f 100644 --- a/release/stable/opensuse423/getLatestTag.ps1 +++ b/release/stable/opensuse423/getLatestTag.ps1 @@ -11,4 +11,4 @@ $repoRoot = Join-Path -path (Join-Path -Path $parent -ChildPath '..') -ChildPath $modulePath = Join-Path -Path $repoRoot -ChildPath 'tools\getDockerTags' Import-Module $modulePath -Get-DockerTags -ShortTags $shortTags -Image "opensuse" -FullTagFilter '^42.3$' -OnlyShortTags +Get-DockerTags -ShortTags $shortTags -Image "opensuse/leap" -FullTagFilter '^42\.3$' -OnlyShortTags