Skip to content

Commit f33689b

Browse files
TravisEz13TravisEz13
authored
Update docker files to allow specifying pwsh and from image version (PowerShell#6835)
Update docker files to allow specifying pwsh and from image version - Also updated to install security updates when building images
1 parent 8f37c92 commit f33689b

6 files changed

Lines changed: 28 additions & 12 deletions

File tree

‎docker/release/centos7/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Docker image file that describes an Centos7 image with PowerShell installed from Microsoft YUM Repo
2+
ARG FromTag=7
23

3-
FROM centos:7
4+
FROM centos:${FromTag}
45

56
ARG POWERSHELL_VERSION=6.0.2
67
ARG IMAGE_NAME=microsoft/powershell:centos7
@@ -38,7 +39,7 @@ RUN curl https://packages.microsoft.com/config/rhel/7/prod.repo | tee /etc/yum.r
3839

3940
# Install latest powershell from Microsoft YUM Repo
4041
RUN yum install -y \
41-
powershell \
42+
powershell-${POWERSHELL_VERSION} \
4243
&& yum clean all
4344

4445
# Use PowerShell as the default shell

‎docker/release/fedora26/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Docker image file that describes an fedora 25 image with PowerShell installed from Microsoft YUM Repo
2+
ARG FromTag=26
23

3-
FROM fedora:26
4+
FROM fedora:${FromTag}
45

56
ARG POWERSHELL_VERSION=6.0.2
67
ARG IMAGE_NAME=microsoft/powershell:fedora26
@@ -38,7 +39,7 @@ RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
3839
RUN curl https://packages.microsoft.com/config/rhel/7/prod.repo | tee /etc/yum.repos.d/microsoft.repo
3940

4041
# Install latest powershell from Microsoft YUM Repo
41-
RUN dnf install -y powershell \
42+
RUN dnf install -y powershell-${POWERSHELL_VERSION} \
4243
&& dnf clean all
4344

4445
# Use array to avoid Docker prepending /bin/sh -c

‎docker/release/fedora27/Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Docker image file that describes an fedora 27 image with PowerShell installed from Microsoft YUM Repo
2+
ARG FromTag=27
23

3-
FROM fedora:27
4+
FROM fedora:${FromTag}
45

56
ARG POWERSHELL_VERSION=6.0.2
67
ARG IMAGE_NAME=microsoft/powershell:fedora27
@@ -39,7 +40,7 @@ RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
3940
RUN curl https://packages.microsoft.com/config/rhel/7/prod.repo | tee /etc/yum.repos.d/microsoft.repo
4041

4142
# Install latest powershell from Microsoft YUM Repo
42-
RUN dnf install -y powershell \
43+
RUN dnf install -y powershell-${POWERSHELL_VERSION}} \
4344
&& dnf clean all
4445

4546
# Use array to avoid Docker prepending /bin/sh -c

‎docker/release/opensuse42.2/Dockerfile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Docker image file that describes an OpenSUSE 42.2 image with PowerShell installed from PowerShell Release
2+
ARG FromTag=42.2
23

3-
FROM opensuse:42.2
4+
FROM opensuse:${FromTag}
45

56
ARG POWERSHELL_VERSION=6.0.2
67
ARG POWERSHELL_PACKAGE=powershell-6.0.2-linux-x64.tar.gz

‎docker/release/ubuntu14.04/Dockerfile‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# Docker image file that describes an Ubuntu14.04 image with PowerShell installed from Microsoft APT Repo
2+
ARG FromTag=14.04
23

3-
FROM ubuntu:trusty
4+
FROM ubuntu:${FromTag}
45

56
ARG POWERSHELL_VERSION=6.0.2
7+
ARG POWERSHELL_VERSION_POSTFIX=-1.ubuntu.14.04
68
ARG IMAGE_NAME=microsoft/powershell:ubuntu14.04
79

810
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
@@ -34,6 +36,8 @@ RUN apt-get update \
3436
ca-certificates \
3537
curl \
3638
apt-transport-https \
39+
&& apt-get dist-upgrade -y \
40+
&& apt-get clean \
3741
&& rm -rf /var/lib/apt/lists/*
3842

3943
# Import the public repository GPG keys for Microsoft
@@ -45,7 +49,9 @@ RUN curl https://packages.microsoft.com/config/ubuntu/14.04/prod.list | tee /etc
4549
# Install powershell from Microsoft Repo
4650
RUN apt-get update \
4751
&& apt-get install -y --no-install-recommends \
48-
powershell
52+
powershell=${POWERSHELL_VERSION}${POWERSHELL_VERSION_POSTFIX} \
53+
&& apt-get clean \
54+
&& rm -rf /var/lib/apt/lists/*
4955

5056
# Use PowerShell as the default shell
5157
# Use array to avoid Docker prepending /bin/sh -c

‎docker/release/ubuntu16.04/Dockerfile‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
# Docker image file that describes an Ubuntu16.04 image with PowerShell installed from Microsoft APT Repo
2+
ARG FromTag=16.04
23

3-
FROM ubuntu:xenial
4+
FROM ubuntu:${FromTag}
45

56
ARG POWERSHELL_VERSION=6.0.2
7+
ARG POWERSHELL_VERSION_POSTFIX=-1.ubuntu.16.04
68
ARG IMAGE_NAME=microsoft/powershell:ubuntu16.04
79

810
LABEL maintainer="PowerShell Team <powershellteam@hotmail.com>" \
@@ -29,7 +31,9 @@ RUN apt-get update \
2931
ca-certificates \
3032
curl \
3133
apt-transport-https \
32-
locales\
34+
locales \
35+
&& apt-get dist-upgrade -y \
36+
&& apt-get clean \
3337
&& rm -rf /var/lib/apt/lists/*
3438

3539
# Setup the locale
@@ -46,7 +50,9 @@ RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc
4650
# Install powershell from Microsoft Repo
4751
RUN apt-get update \
4852
&& apt-get install -y --no-install-recommends \
49-
powershell
53+
powershell=${POWERSHELL_VERSION}${POWERSHELL_VERSION_POSTFIX} \
54+
&& apt-get clean \
55+
&& rm -rf /var/lib/apt/lists/*
5056

5157
# Use PowerShell as the default shell
5258
# Use array to avoid Docker prepending /bin/sh -c

0 commit comments

Comments
 (0)