-
Notifications
You must be signed in to change notification settings - Fork 4.1k
Upgrade docker image BaseImage from powershell to dotnet/sdk #28527
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.
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
Open
YanaXu
wants to merge
1
commit into
main
Choose a base branch
from
yanxu/dockerimage_upgrade
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
|
|
@@ -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" \ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
|
Comment on lines
+1
to
+2
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The original file was based on UBI-8 (using yum commands) but the new Alpine base image uses apk. However, the package manager command change from Copilot uses AI. Check for mistakes. Positive FeedbackNegative Feedback |
||
|
|
||
| ARG REPOSITORY=PSGallery | ||
| ARG MODULE=Az | ||
|
|
@@ -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 | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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 | ||
|
|
@@ -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" \ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The original base image was
mcr.microsoft.com/powershell:alpine-3.20but the new image uses Alpine 3.21. This version change should be intentional - verify that Alpine 3.21 is the correct target version and not Alpine 3.20.Copilot uses AI. Check for mistakes.