diff --git a/release/community-stable/amazonlinux/docker/Dockerfile b/release/community-stable/amazonlinux/docker/Dockerfile index 38d815b08..236e9f4b0 100644 --- a/release/community-stable/amazonlinux/docker/Dockerfile +++ b/release/community-stable/amazonlinux/docker/Dockerfile @@ -19,9 +19,6 @@ ARG PS_INSTALL_VERSION=6 # Define Args and Env needed to create links ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION -# Download the RHEL7 PowerShell Core package and save it -ADD ${PS_PACKAGE_URL} /tmp/powershell-linux.rpm - # Define Args and Env needed to create links ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \ \ @@ -33,9 +30,9 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \ PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache # Installation -RUN \ +RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \ # install dependencies - yum install -y \ + && yum install -y \ # required for help in PowerShell less \ # NTLM remoting diff --git a/release/community-stable/oraclelinux/docker/Dockerfile b/release/community-stable/oraclelinux/docker/Dockerfile index dacf1bc42..820e7a386 100644 --- a/release/community-stable/oraclelinux/docker/Dockerfile +++ b/release/community-stable/oraclelinux/docker/Dockerfile @@ -19,9 +19,6 @@ ARG PS_INSTALL_VERSION=6 # Define Args and Env needed to create links ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION -# Download the RHEL7 PowerShell Core package and save it -ADD ${PS_PACKAGE_URL} /tmp/powershell-linux.rpm - # Define Args and Env needed to create links ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \ \ @@ -33,9 +30,9 @@ ENV PS_INSTALL_FOLDER=/opt/microsoft/powershell/$PS_INSTALL_VERSION \ PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache # Installation -RUN \ +RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell-linux.rpm \ # install dependencies - yum install -y \ + && yum install -y \ # required for help in powershell less \ epel-release \ diff --git a/release/preview/centos7/docker/Dockerfile b/release/preview/centos7/docker/Dockerfile index 4f1bc917f..18088f282 100644 --- a/release/preview/centos7/docker/Dockerfile +++ b/release/preview/centos7/docker/Dockerfile @@ -9,9 +9,6 @@ ARG PACKAGE_VERSION=6.2.0_preview.2 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} -# Download the Linux package and save it -ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm - # Define ENVs for Localization/Globalization ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ LC_ALL=en_US.UTF-8 \ @@ -20,7 +17,8 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache # Install dependencies and clean up -RUN yum install -y /tmp/powershell.rpm \ +RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ + && yum install -y /tmp/powershell.rpm \ # Required for gssntlmssp && yum install -y epel-release \ # Update now that we have epel-release diff --git a/release/preview/fedora28/docker/Dockerfile b/release/preview/fedora28/docker/Dockerfile index 2fac61178..e62e85f04 100644 --- a/release/preview/fedora28/docker/Dockerfile +++ b/release/preview/fedora28/docker/Dockerfile @@ -9,10 +9,6 @@ ARG PACKAGE_VERSION=6.2.0_preview.2 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} - -# Download the Linux package and save it -ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm - # Define ENVs for Localization/Globalization ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ LC_ALL=en_US.UTF-8 \ @@ -21,7 +17,8 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache # Install dependencies and clean up -RUN dnf install -y /tmp/powershell.rpm \ +RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ + && dnf install -y /tmp/powershell.rpm \ && dnf install -y \ # less is needed for help less \ diff --git a/release/servicing/centos7/docker/Dockerfile b/release/servicing/centos7/docker/Dockerfile index 295a13c3b..94f330acf 100644 --- a/release/servicing/centos7/docker/Dockerfile +++ b/release/servicing/centos7/docker/Dockerfile @@ -9,9 +9,6 @@ ARG PACKAGE_VERSION=6.1.1 ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} -# Download the Linux package and save it -ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm - # Define ENVs for Localization/Globalization ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ LC_ALL=en_US.UTF-8 \ @@ -20,7 +17,8 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache # Install dependencies and clean up -RUN yum install -y /tmp/powershell.rpm \ +RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ + && yum install -y /tmp/powershell.rpm \ # Required for gssntlmssp && yum install -y epel-release \ # Update now that we have epel-release diff --git a/release/servicing/fedora28/docker/Dockerfile b/release/servicing/fedora28/docker/Dockerfile index ece27879f..cc2067c3c 100644 --- a/release/servicing/fedora28/docker/Dockerfile +++ b/release/servicing/fedora28/docker/Dockerfile @@ -8,10 +8,6 @@ ARG PS_VERSION=6.1.0 ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} - -# Download the Linux package and save it -ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm - # Define ENVs for Localization/Globalization ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ LC_ALL=en_US.UTF-8 \ @@ -20,7 +16,8 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache # Install dependencies and clean up -RUN dnf install -y /tmp/powershell.rpm \ +RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ + && dnf install -y /tmp/powershell.rpm \ && dnf install -y \ # less is needed for help less \ diff --git a/release/stable/centos7/docker/Dockerfile b/release/stable/centos7/docker/Dockerfile index b680db40a..b3c87822a 100644 --- a/release/stable/centos7/docker/Dockerfile +++ b/release/stable/centos7/docker/Dockerfile @@ -9,9 +9,6 @@ ARG PACKAGE_VERSION=6.2.0 ARG PS_PACKAGE=powershell-${PACKAGE_VERSION}-1.rhel.7.x86_64.rpm ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} -# Download the Linux package and save it -ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm - # Define ENVs for Localization/Globalization ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ LC_ALL=en_US.UTF-8 \ @@ -20,7 +17,8 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache # Install dependencies and clean up -RUN yum install -y /tmp/powershell.rpm \ +RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ + && yum install -y /tmp/powershell.rpm \ # Required for gssntlmssp && yum install -y epel-release \ # Update now that we have epel-release diff --git a/release/stable/fedora28/docker/Dockerfile b/release/stable/fedora28/docker/Dockerfile index 7ea55dda5..1f7d6c64c 100644 --- a/release/stable/fedora28/docker/Dockerfile +++ b/release/stable/fedora28/docker/Dockerfile @@ -8,10 +8,6 @@ ARG PS_VERSION=6.2.0 ARG PS_PACKAGE=powershell-${PS_VERSION}-1.rhel.7.x86_64.rpm ARG PS_PACKAGE_URL=https://github.com/PowerShell/PowerShell/releases/download/v${PS_VERSION}/${PS_PACKAGE} - -# Download the Linux package and save it -ADD ${PS_PACKAGE_URL} /tmp/powershell.rpm - # Define ENVs for Localization/Globalization ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ LC_ALL=en_US.UTF-8 \ @@ -20,7 +16,8 @@ ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ PSModuleAnalysisCachePath=/var/cache/microsoft/powershell/PSModuleAnalysisCache/ModuleAnalysisCache # Install dependencies and clean up -RUN dnf install -y /tmp/powershell.rpm \ +RUN curl -sSL ${PS_PACKAGE_URL} -o /tmp/powershell.rpm \ + && dnf install -y /tmp/powershell.rpm \ && dnf install -y \ # less is needed for help less \