Skip to content

Commit 0c83acc

Browse files
committed
upgrade docker image baseimage from powershell to dotnet/sdk
1 parent 95c90e6 commit 0c83acc

8 files changed

+29
-136
lines changed

docker/Dockerfile-alpine-3.20 renamed to docker/Dockerfile-alpine-3.21

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/powershell:alpine-3.20
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine3.21
22
RUN apk update && apk upgrade --no-cache
33

44
ARG REPOSITORY=PSGallery
@@ -11,9 +11,9 @@ ARG BUILD_DATE=
1111
ARG VERSION=
1212
ARG LATEST=
1313
ARG BLOB_URL=
14-
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.20
14+
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.21
1515

16-
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.20"
16+
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.21"
1717

1818
LABEL maintainer="Azure PowerShell Team <[email protected]>" \
1919
readme.md="http://aka.ms/azpsdockerreadme" \

docker/Dockerfile-ubi-8 renamed to docker/Dockerfile-alpine-3.22

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM mcr.microsoft.com/powershell:ubi-8
2-
RUN yum update -y && yum clean all
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine3.22
2+
RUN apk update && apk upgrade --no-cache
33

44
ARG REPOSITORY=PSGallery
55
ARG MODULE=Az
@@ -11,26 +11,26 @@ ARG BUILD_DATE=
1111
ARG VERSION=
1212
ARG LATEST=
1313
ARG BLOB_URL=
14-
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubi-8
14+
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.22
1515

16-
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-ubi-8"
16+
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.22"
1717

1818
LABEL maintainer="Azure PowerShell Team <[email protected]>" \
19-
readme.md="http://aka.ms/azpsdockerreadme" \
20-
description="This Dockerfile will install the latest release of Azure PowerShell." \
21-
org.label-schema.build-date=${BUILD_DATE} \
22-
org.label-schema.usage="http://aka.ms/azpsdocker" \
23-
org.label-schema.url="http://aka.ms/azpsdockerreadme" \
24-
org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
25-
org.label-schema.name="azure powershell" \
26-
org.label-schema.vendor="Azure PowerShell" \
27-
org.label-schema.version=${VERSION} \
28-
org.label-schema.schema-version="1.0" \
29-
org.label-schema.vcs-ref=${VCS_REF} \
30-
org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
31-
org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
32-
org.label-schema.docker.cmd.test="currently not available" \
33-
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
19+
readme.md="http://aka.ms/azpsdockerreadme" \
20+
description="This Dockerfile will install the latest release of Azure PowerShell." \
21+
org.label-schema.build-date=${BUILD_DATE} \
22+
org.label-schema.usage="http://aka.ms/azpsdocker" \
23+
org.label-schema.url="http://aka.ms/azpsdockerreadme" \
24+
org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
25+
org.label-schema.name="azure powershell" \
26+
org.label-schema.vendor="Azure PowerShell" \
27+
org.label-schema.version=${VERSION} \
28+
org.label-schema.schema-version="1.0" \
29+
org.label-schema.vcs-ref=${VCS_REF} \
30+
org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
31+
org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
32+
org.label-schema.docker.cmd.test="currently not available" \
33+
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"
3434

3535
RUN if [ "${LATEST}" = True ] ; then \
3636
# install latest azure-powershell from BLOB

docker/Dockerfile-azurelinux-3.0

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM mcr.microsoft.com/powershell:azurelinux-3.0
2-
RUN tdnf update -y && tdnf upgrade -y && tdnf clean all
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0-azurelinux3.0
2+
RUN tdnf update -y && tdnf upgrade -y && tdnf install -y tar gzip && tdnf clean all
33

44
ARG REPOSITORY=PSGallery
55
ARG MODULE=Az

docker/Dockerfile-azurelinux-3.0-arm64

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM mcr.microsoft.com/powershell:azurelinux-3.0-arm64
2-
RUN tdnf update -y && tdnf upgrade -y && tdnf clean all
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0-azurelinux3.0-arm64v8
2+
RUN tdnf update -y && tdnf upgrade -y && tdnf install -y tar gzip && tdnf clean all
33

44
ARG REPOSITORY=PSGallery
55
ARG MODULE=Az
@@ -13,7 +13,7 @@ ARG LATEST=
1313
ARG BLOB_URL=
1414
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-azurelinux-3.0-arm64
1515

16-
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-azurelinux-3.0"
16+
ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-azurelinux-3.0-arm64"
1717

1818
LABEL maintainer="Azure PowerShell Team <[email protected]>" \
1919
readme.md="http://aka.ms/azpsdockerreadme" \

docker/Dockerfile-debian-12

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/powershell:debian-12
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0-bookworm-slim
22
RUN apt-get update && apt-get upgrade -y && apt-get clean && rm -rf /var/lib/apt/lists/*
33

44
ARG REPOSITORY=PSGallery

docker/Dockerfile-ubi-9

Lines changed: 0 additions & 53 deletions
This file was deleted.

docker/Dockerfile-ubuntu-22.04

Lines changed: 0 additions & 54 deletions
This file was deleted.

docker/Dockerfile-ubuntu-24.04

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/powershell:ubuntu-24.04
1+
FROM mcr.microsoft.com/dotnet/sdk:9.0-noble
22
RUN apt-get update && apt-get upgrade -y && apt-get clean && rm -rf /var/lib/apt/lists/*
33

44
ARG REPOSITORY=PSGallery

0 commit comments

Comments
 (0)