Skip to content

Download, install, and delete pwsh dist in the same layer to reduce final image size (RedHat family-only) #207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 4 commits into from
Apr 11, 2019
Merged

Download, install, and delete pwsh dist in the same layer to reduce final image size (RedHat family-only) #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
90251a7
improvement: download and install pwsh in the same layer on fedora
Apr 10, 2019
c688f91
improvement: download and install pwsh in the same layer on amazonlinux
Apr 10, 2019
28be30f
improvement: download and install pwsh in the same layer on oraclelinux
Apr 10, 2019
9da7774
improvement: download and install pwsh in the same layer on centos7
Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions release/community-stable/amazonlinux/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
\
Expand All @@ -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
Expand Down
7 changes: 2 additions & 5 deletions release/community-stable/oraclelinux/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
\
Expand All @@ -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 \
Expand Down
6 changes: 2 additions & 4 deletions release/preview/centos7/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down
7 changes: 2 additions & 5 deletions release/preview/fedora28/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
6 changes: 2 additions & 4 deletions release/servicing/centos7/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down
7 changes: 2 additions & 5 deletions release/servicing/fedora28/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
6 changes: 2 additions & 4 deletions release/stable/centos7/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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
Expand Down
7 changes: 2 additions & 5 deletions release/stable/fedora28/docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down