diff --git a/.dependabot/config.yml b/.dependabot/config.yml index d59f2d75e..a36172e4c 100644 --- a/.dependabot/config.yml +++ b/.dependabot/config.yml @@ -8,7 +8,7 @@ update_configs: update_schedule: "weekly" - package_manager: "docker" - directory: "/release/preview/alpine311/dependabot" + directory: "/release/preview/alpine311/docker" update_schedule: "weekly" - package_manager: "docker" @@ -24,7 +24,7 @@ update_configs: update_schedule: "weekly" - package_manager: "docker" - directory: "/release/preview/fedora/dependabot" + directory: "/release/preview/fedora/docker" update_schedule: "weekly" - package_manager: "docker" diff --git a/release/preview/arm32v7/docker/Dockerfile b/release/preview/arm32v7/docker/Dockerfile index 229e11ffb..2d6ab658b 100644 --- a/release/preview/arm32v7/docker/Dockerfile +++ b/release/preview/arm32v7/docker/Dockerfile @@ -1,10 +1,7 @@ # Copyright (c) Microsoft Corporation. All rights reserved. # Licensed under the MIT License. -ARG fromTag=bionic -ARG imageRepo=arm32v7/ubuntu - -FROM ${imageRepo}:${fromTag} AS installer-env +FROM arm32v7/ubuntu:bionic AS installer-env ARG PS_VERSION=6.2.3 ENV PS_PACKAGE=powershell-${PS_VERSION}-linux-arm32.tar.gz @@ -39,7 +36,7 @@ RUN ls -l /tmp/powershell.tar.gz # Unzip the Linux tar.gz RUN tar zxf /tmp/powershell.tar.gz -C ${PS_INSTALL_FOLDER} -FROM ${imageRepo}:${fromTag} AS final-image +FROM arm32v7/ubuntu:bionic AS final-image # Define Args and Env needed to create links ARG PS_INSTALL_VERSION=7-preview diff --git a/release/preview/arm32v7/getLatestTag.ps1 b/release/preview/arm32v7/getLatestTag.ps1 deleted file mode 100644 index f4574e134..000000000 --- a/release/preview/arm32v7/getLatestTag.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. - -# return objects representing the tags we need to base the CentOS image on Docker - -# The versions of CentOS we care about -$shortTags = @('bionic') - -$parent = Join-Path -Path $PSScriptRoot -ChildPath '..' -$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 "arm32v7/ubuntu" -FullTagFilter '^bionic-\d{8}$' -AlternativeShortTag '18.04' diff --git a/release/preview/arm32v7/meta.json b/release/preview/arm32v7/meta.json index 3ba1260ef..dd09585d1 100644 --- a/release/preview/arm32v7/meta.json +++ b/release/preview/arm32v7/meta.json @@ -10,6 +10,9 @@ "#psversion#-arm32v7-ubuntu-#tag#", "preview-arm32v7-ubuntu-#shorttag#" ], + "shortTags": [ + {"Tag": "bionic"} + ], "TestProperties": { "size": 550, "Arm32": true diff --git a/release/preview/fedora/dependabot/Dockerfile b/release/preview/fedora/dependabot/Dockerfile deleted file mode 100644 index 2b4d6bd3e..000000000 --- a/release/preview/fedora/dependabot/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. - -# Dummy docker image to trigger dependabot PRs - -FROM fedora:30 diff --git a/release/preview/fedora/docker/Dockerfile b/release/preview/fedora/docker/Dockerfile index 91edc1c55..5915ac4eb 100644 --- a/release/preview/fedora/docker/Dockerfile +++ b/release/preview/fedora/docker/Dockerfile @@ -1,15 +1,12 @@ -# Docker image file that describes Fedora 28 image with PowerShell installed from Microsoft YUM Repo -ARG fromTag=28 -ARG imageRepo=fedora +# Docker image file that describes Fedora 31 image with PowerShell installed from Microsoft YUM Repo -FROM ${imageRepo}:${fromTag} AS installer-env +FROM fedora:31 AS installer-env ARG PS_VERSION=7.0.0-preview.1 ARG PACKAGE_VERSION=7.0.0_preview.1 ARG PS_PACKAGE=powershell-preview-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} -ARG fromTag=28 # Define ENVs for Localization/Globalization ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ @@ -17,7 +14,7 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ LANG=en_US.UTF-8 \ # set a fixed location for the Module analysis cache PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache \ - POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-${fromTag} + POWERSHELL_DISTRIBUTION_CHANNEL=PSDocker-Fedora-31 # Install dependencies and clean up RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ diff --git a/release/preview/fedora/getLatestTag.ps1 b/release/preview/fedora/getLatestTag.ps1 deleted file mode 100644 index c9ad27d2d..000000000 --- a/release/preview/fedora/getLatestTag.ps1 +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) Microsoft Corporation. All rights reserved. -# Licensed under the MIT License. - -# return objects representing the tags we need to base the fedora image on - -# The versions of fedora we care about -$shortTags = @('30') - -$parent = Join-Path -Path $PSScriptRoot -ChildPath '..' -$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 "fedora" -FullTagFilter '^\d{2}$' -OnlyShortTags diff --git a/release/preview/fedora/meta.json b/release/preview/fedora/meta.json index 9e1c98a74..b5de07612 100644 --- a/release/preview/fedora/meta.json +++ b/release/preview/fedora/meta.json @@ -2,12 +2,15 @@ "IsLinux" : true, "UseLinuxVersion": false, "PackageFormat": "powershell${previewTag}-${PS_VERSION}-1.rhel.7.x86_64.rpm", - "osVersion": "Fedora", + "osVersion": "Fedora 31", "SkipGssNtlmSspTests": false, "tagTemplates": [ "#psversion#-fedora-#tag#", "preview-fedora-#shorttag#" ], + "shortTags": [ + {"Tag": "31"} + ], "SubImage": "test-deps", "TestProperties": { "size": 632 diff --git a/release/preview/fedora/test-deps/meta.json b/release/preview/fedora/test-deps/meta.json index ae99ee413..728e0f6d6 100644 --- a/release/preview/fedora/test-deps/meta.json +++ b/release/preview/fedora/test-deps/meta.json @@ -1,7 +1,7 @@ { "IsLinux" : true, "UseLinuxVersion": false, - "osVersion": "Fedora ${fromTag}", + "osVersion": "Fedora 31", "SkipGssNtlmSspTests": false, "tagTemplates": [ "#tag#" diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/unstable/oraclelinux/docker/Dockerfile similarity index 100% rename from release/community-stable/oraclelinux/docker/Dockerfile rename to release/unstable/oraclelinux/docker/Dockerfile diff --git a/release/community-stable/oraclelinux/meta.json b/release/unstable/oraclelinux/meta.json similarity index 100% rename from release/community-stable/oraclelinux/meta.json rename to release/unstable/oraclelinux/meta.json