Remove add command

build.ps1

@@ -156,8 +156,10 @@ param(
     [Parameter(ParameterSetName="GenerateMatrixJson")]
     [string]
     [ValidateSet('All','Linux','Windows')]
-    $OsFilter
+    $OsFilter,
 
+    [switch]
+    $ResetPSDockerCache
 )
 
 DynamicParam {
@@ -227,6 +229,11 @@ Begin {
 
     $ENV:DOCKER_BUILDKIT = 1
 
+    if ($ResetPSDockerCache)
+    {
+        Reset-CacheFolder
+    }
+
     if ($PSCmdlet.ParameterSetName -notin 'GenerateMatrixJson', 'GenerateTagsYaml', 'DupeCheck', 'GenerateManifestLists' -and $Channel.Count -gt 1)
     {
         throw "Multiple Channels are not supported in this parameter set"

release/7-2/alpine313/docker/Dockerfile

@@ -5,17 +5,11 @@
 
 FROM alpine:3.13 AS installer-env
 
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+COPY ${PS_INSTALL_PATH} /tmp/linux.tar.gz
 
 # define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+ENV PS_INSTALL_VERSION=7 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
 
 # Create the install folder
 RUN mkdir -p ${PS_INSTALL_FOLDER}
@@ -29,10 +23,9 @@ FROM alpine:3.13
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
 
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
+# Define Args and EnvS
+ENV PS_INSTALL_VERSION=7 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
     # Define ENVs for Localization/Globalization
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \

release/7-2/alpine314/docker/Dockerfile

@@ -5,17 +5,11 @@
 
 FROM alpine:3.14 AS installer-env
 
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.0.0
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-alpine-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+COPY ${PS_INSTALL_PATH} /tmp/linux.tar.gz
 
 # define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
+ENV PS_INSTALL_VERSION=7 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
 
 # Create the install folder
 RUN mkdir -p ${PS_INSTALL_FOLDER}
@@ -29,10 +23,9 @@ FROM alpine:3.14
 # Copy only the files we need from the previous stage
 COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
 
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-  \
+# Define Args and Envs
+ENV PS_INSTALL_VERSION=7 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
   # Define ENVs for Localization/Globalization
   DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
   LC_ALL=en_US.UTF-8 \

release/7-2/debian10/docker/Dockerfile

@@ -1,52 +1,27 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
-ARG imageRepo=debian
-
-FROM ${imageRepo}:buster-slim AS installer-env
+# Docker image file that describes an Debian 10 image with PowerShell installed from Microsoft APT Repo
+FROM debian:buster-slim AS installer-env
 
 # Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
-
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
-
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
+COPY ${PS_INSTALL_PATH} /tmp/powershell.deb
 
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+FROM debian:buster-slim as final-image
 
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM ${imageRepo}:buster-slim
-
-ARG PS_VERSION=7.0.0
-ARG PS_INSTALL_VERSION=7
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     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-Debian-10
 
 # Install dependencies and clean up
-RUN apt-get update \
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
     && apt-get install --no-install-recommends -y \
     # less is required for help in powershell
         less \
@@ -71,12 +46,7 @@ RUN apt-get update \
     # enable en_US.UTF-8 locale
     && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
     # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && locale-gen && update-locale \
     # intialize powershell module cache
     # and disable telemetry
     && export POWERSHELL_TELEMETRY_OPTOUT=1 \

release/7-2/debian10/meta.json

@@ -1,7 +1,7 @@
 {
     "IsLinux" : true,
     "UseLinuxVersion" : false,
-    "PackageFormat": "powershell-${PS_VERSION}-linux-x64.tar.gz",
+    "PackageFormat": "powershell${channelTag}_${PS_VERSION}-1.deb_amd64.deb",
     "osVersion": "Debian 10",
     "SkipGssNtlmSspTests": false,
     "tagTemplates": [
@@ -14,7 +14,7 @@
     ],
     "SubImage": "test-deps",
     "TestProperties": {
-        "size": 314
+        "size": 329
     },
     "EndOfLife": "2024-06-01",
     "DistributionState": "Validated"

release/7-2/debian11/docker/Dockerfile

@@ -1,55 +1,32 @@
 # Copyright (c) Microsoft Corporation.
 # Licensed under the MIT License.
 
-# Docker image file that describes an Debian image with PowerShell installed from Microsoft APT Repo
+# Docker image file that describes an Debian 11 image with PowerShell installed from Microsoft APT Repo
 
 FROM debian:bullseye-slim AS installer-env
 
-# Define Args for the needed to add the package
-ARG PS_VERSION=6.2.3
-ARG PS_PACKAGE=powershell-${PS_VERSION}-linux-x64.tar.gz
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7
+COPY ${PS_INSTALL_PATH} /tmp/powershell.deb
 
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/linux.tar.gz
+FROM debian:bullseye-slim as final-image
 
-# define the folder we will be installing PowerShell to
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION
-
-# Create the install folder
-RUN mkdir -p ${PS_INSTALL_FOLDER}
-
-# Unzip the Linux tar.gz
-RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
-
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM debian:bullseye-slim
-
-ARG PS_VERSION=6.2.0
-ARG PS_INSTALL_VERSION=7
-
-# Copy only the files we need from the previous stage
-COPY --from=installer-env ["/opt/microsoft/powershell", "/opt/microsoft/powershell"]
-
-# Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
-    # Define ENVs for Localization/Globalization
-    DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
+# Define ENVs for Localization/Globalization
+ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
     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-Debian-11
 
 # Install dependencies and clean up
-RUN apt-get update \
+RUN --mount=from=installer-env,target=/mnt/pwsh,source=/tmp \
+    --mount=type=cache,target=/var/lib/apt \
+    --mount=type=cache,target=/var/cache/apt \
+    apt-get update \
+    && apt-get install --no-install-recommends -y /mnt/pwsh/powershell.deb \
     && apt-get install --no-install-recommends -y \
     # less is required for help in powershell
         less \
-    # requied to setup the locale
+    # required to setup the locale
         locales \
     # required for SSL
         ca-certificates \
@@ -70,12 +47,7 @@ RUN apt-get update \
     # enable en_US.UTF-8 locale
     && sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/g' /etc/locale.gen \
     # generate locale
-    && locale-gen && update-locale
-
-    # Give all user execute permissions and remove write permissions for others
-RUN chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
-    # Create the pwsh symbolic link that points to powershell
-    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    && locale-gen && update-locale \
     # intialize powershell module cache
     # and disable telemetry
     && export POWERSHELL_TELEMETRY_OPTOUT=1 \

release/7-2/mariner2/docker/Dockerfile

@@ -3,27 +3,31 @@
 
 FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS installer-env
 
-# Define Args for the needed to add the package
-ARG PS_VERSION=7.2.5
-ARG PS_PACKAGE=powershell-${PS_VERSION}-1.cm1.x86_64.rpm
-ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE}
-ARG PS_INSTALL_VERSION=7-preview
+COPY ${PS_INSTALL_PATH} /tmp/linux.tar.gz
 
-# Download the Linux tar.gz and save it
-ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm
+# define the folder we will be installing PowerShell to
+ENV PS_INSTALL_VERSION=7 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION}
 
-RUN echo ${PS_PACKAGE_URL}
+# Create the install folder
+RUN mkdir -p ${PS_INSTALL_FOLDER}
 
-# Start a new stage so we lose all the tar.gz layers from the final image
-FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS powershell
+# Install tar a gzip so we can unzip the tar.gz
+RUN --mount=type=cache,target=/var/cache/tdnf \
+    tdnf install -y \
+    tar \
+    gzip \
+    && tdnf clean all
 
-ARG PS_VERSION=7.2.5
-ARG PS_INSTALL_VERSION=7-preview
+# Unzip the Linux tar.gz
+RUN tar zxf /tmp/linux.tar.gz -C ${PS_INSTALL_FOLDER}
+
+# Start a new stage so we lose all the tar.gz layers in the final image
+FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 AS final-image
 
 # Define Args and Env needed to create links
-ARG PS_INSTALL_VERSION=7-preview
-ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \
-    \
+ENV PS_INSTALL_VERSION=7 \
+    PS_INSTALL_FOLDER=/opt/microsoft/powershell/${PS_INSTALL_VERSION} \
     # Define ENVs for Localization/Globalization
     DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \
     LC_ALL=en_US.UTF-8 \
@@ -49,18 +53,16 @@ RUN --mount=type=cache,target=/var/cache/tdnf \
     # upgrade packages
     && tdnf upgrade -y \
     # clean cached data
-    && tdnf clean all
-
-RUN --mount=type=cache,target=/var/cache/tdnf,rw \
-    --mount=from=installer-env,target=/mnt/rpm,source=/tmp \
-    rpm -i /mnt/rpm/powershell.rpm
-
-# Create the pwsh symbolic link that points to powershell
-RUN if [ -f "/opt/microsoft/powershell/7-preview/pwsh" ]; then ln -sf /opt/microsoft/powershell/7-preview/pwsh /usr/bin/pwsh; fi
-
-# intialize powershell module cache
-# and disable telemetry for this ONE session
-RUN export POWERSHELL_TELEMETRY_OPTOUT=1 \
+    && tdnf clean all \
+    # Give all user execute permissions and remove write permissions for others
+    && chmod a+x,o-w ${PS_INSTALL_FOLDER}/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh \
+    # Create the pwsh symbolic link that points to powershell
+    && ln -s ${PS_INSTALL_FOLDER}/pwsh /usr/bin/pwsh-preview \
+    # intialize powershell module cache
+    # and disable telemetry
+    && export POWERSHELL_TELEMETRY_OPTOUT=1 \
     && pwsh \
         -NoLogo \
         -NoProfile \