Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/powershell:alpine-3.20
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine3.21
RUN apk update && apk upgrade --no-cache

ARG REPOSITORY=PSGallery
Expand All @@ -11,9 +11,9 @@ ARG BUILD_DATE=
ARG VERSION=
ARG LATEST=
ARG BLOB_URL=
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.20
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.21

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

LABEL maintainer="Azure PowerShell Team <[email protected]>" \
readme.md="http://aka.ms/azpsdockerreadme" \
Expand Down
38 changes: 19 additions & 19 deletions docker/Dockerfile-ubi-8 → docker/Dockerfile-alpine-3.22
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM mcr.microsoft.com/powershell:ubi-8
RUN yum update -y && yum clean all
FROM mcr.microsoft.com/dotnet/sdk:9.0-alpine3.22
RUN apk update && apk upgrade --no-cache

ARG REPOSITORY=PSGallery
ARG MODULE=Az
Expand All @@ -11,26 +11,26 @@ ARG BUILD_DATE=
ARG VERSION=
ARG LATEST=
ARG BLOB_URL=
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-ubi-8
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.22

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

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

RUN if [ "${LATEST}" = True ] ; then \
# install latest azure-powershell from BLOB
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile-azurelinux-3.0
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM mcr.microsoft.com/powershell:azurelinux-3.0
RUN tdnf update -y && tdnf upgrade -y && tdnf clean all
FROM mcr.microsoft.com/dotnet/sdk:9.0-azurelinux3.0
RUN tdnf update -y && tdnf upgrade -y && tdnf install -y tar gzip && tdnf clean all

ARG REPOSITORY=PSGallery
ARG MODULE=Az
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile-azurelinux-3.0-arm64
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM mcr.microsoft.com/powershell:azurelinux-3.0-arm64
RUN tdnf update -y && tdnf upgrade -y && tdnf clean all
FROM mcr.microsoft.com/dotnet/sdk:9.0-azurelinux3.0-arm64v8
RUN tdnf update -y && tdnf upgrade -y && tdnf install -y tar gzip && tdnf clean all

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

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

LABEL maintainer="Azure PowerShell Team <[email protected]>" \
readme.md="http://aka.ms/azpsdockerreadme" \
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-debian-12
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/powershell:debian-12
FROM mcr.microsoft.com/dotnet/sdk:9.0-bookworm-slim
RUN apt-get update && apt-get upgrade -y && apt-get clean && rm -rf /var/lib/apt/lists/*

ARG REPOSITORY=PSGallery
Expand Down
53 changes: 0 additions & 53 deletions docker/Dockerfile-ubi-9

This file was deleted.

54 changes: 0 additions & 54 deletions docker/Dockerfile-ubuntu-22.04

This file was deleted.

2 changes: 1 addition & 1 deletion docker/Dockerfile-ubuntu-24.04
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mcr.microsoft.com/powershell:ubuntu-24.04
FROM mcr.microsoft.com/dotnet/sdk:9.0-noble
RUN apt-get update && apt-get upgrade -y && apt-get clean && rm -rf /var/lib/apt/lists/*

ARG REPOSITORY=PSGallery
Expand Down
Loading