diff --git a/README.aspnet.md b/README.aspnet.md index c0aaf48076..b625438c5b 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -148,20 +148,20 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.0-preview.1-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-preview.1-resolute, 11.0-preview-resolute, 11.0.0-preview.1, 11.0-preview | [Dockerfile](src/aspnet/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-preview.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-preview.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-composite-amd64, 11.0-preview-resolute-chiseled-composite-amd64, 11.0.0-preview.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-composite-extra-amd64, 11.0-preview-resolute-chiseled-composite-extra-amd64, 11.0.0-preview.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-preview.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-composite-extra-amd64, 11.0-preview-alpine3.23-composite-extra-amd64, 11.0-preview-alpine-composite-extra-amd64, 11.0.0-preview.1-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-composite-amd64, 11.0-preview-azurelinux3.0-distroless-composite-amd64, 11.0.0-preview.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-composite-extra-amd64, 11.0-preview-azurelinux3.0-distroless-composite-extra-amd64, 11.0.0-preview.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-preview.2-resolute, 11.0-preview-resolute, 11.0.0-preview.2, 11.0-preview | [Dockerfile](src/aspnet/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-preview.2-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-preview.2-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-composite-amd64, 11.0-preview-resolute-chiseled-composite-amd64, 11.0.0-preview.2-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-composite-extra-amd64, 11.0-preview-resolute-chiseled-composite-extra-amd64, 11.0.0-preview.2-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.2-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-composite-amd64, 11.0-preview-alpine3.23-composite-amd64, 11.0-preview-alpine-composite-amd64, 11.0.0-preview.2-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-composite-extra-amd64, 11.0-preview-alpine3.23-composite-extra-amd64, 11.0-preview-alpine-composite-extra-amd64, 11.0.0-preview.2-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.2-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.2-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.2-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-composite-amd64, 11.0-preview-azurelinux3.0-distroless-composite-amd64, 11.0.0-preview.2-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-composite-extra-amd64, 11.0-preview-azurelinux3.0-distroless-composite-extra-amd64, 11.0.0-preview.2-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile) | Azure Linux 3.0 ### Linux arm64 Tags @@ -233,20 +233,20 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.0-preview.1-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-preview.1-resolute, 11.0-preview-resolute, 11.0.0-preview.1, 11.0-preview | [Dockerfile](src/aspnet/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-preview.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-preview.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-composite-arm64v8, 11.0-preview-resolute-chiseled-composite-arm64v8, 11.0.0-preview.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-composite-extra-arm64v8, 11.0-preview-resolute-chiseled-composite-extra-arm64v8, 11.0.0-preview.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-preview.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-composite-extra-arm64v8, 11.0-preview-alpine3.23-composite-extra-arm64v8, 11.0-preview-alpine-composite-extra-arm64v8, 11.0.0-preview.1-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-composite-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-arm64v8, 11.0.0-preview.1-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0.0-preview.1-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-preview.2-resolute, 11.0-preview-resolute, 11.0.0-preview.2, 11.0-preview | [Dockerfile](src/aspnet/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-preview.2-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-preview.2-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-composite-arm64v8, 11.0-preview-resolute-chiseled-composite-arm64v8, 11.0.0-preview.2-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-composite-extra-arm64v8, 11.0-preview-resolute-chiseled-composite-extra-arm64v8, 11.0.0-preview.2-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.2-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-composite-arm64v8, 11.0-preview-alpine3.23-composite-arm64v8, 11.0-preview-alpine-composite-arm64v8, 11.0.0-preview.2-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-composite-extra-arm64v8, 11.0-preview-alpine3.23-composite-extra-arm64v8, 11.0-preview-alpine-composite-extra-arm64v8, 11.0.0-preview.2-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.2-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.2-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.2-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-composite-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-arm64v8, 11.0.0-preview.2-azurelinux3.0-distroless-composite, 11.0-preview-azurelinux3.0-distroless-composite | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-composite-extra-arm64v8, 11.0.0-preview.2-azurelinux3.0-distroless-composite-extra, 11.0-preview-azurelinux3.0-distroless-composite-extra | [Dockerfile](src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile) | Azure Linux 3.0 ### Linux arm32 Tags @@ -298,15 +298,15 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.0-preview.1-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-preview.1-resolute, 11.0-preview-resolute, 11.0.0-preview.1, 11.0-preview | [Dockerfile](src/aspnet/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-preview.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-preview.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-composite-arm32v7, 11.0-preview-resolute-chiseled-composite-arm32v7, 11.0.0-preview.1-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-composite-extra-arm32v7, 11.0-preview-resolute-chiseled-composite-extra-arm32v7, 11.0.0-preview.1-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-preview.1-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-composite-extra-arm32v7, 11.0-preview-alpine3.23-composite-extra-arm32v7, 11.0-preview-alpine-composite-extra-arm32v7, 11.0.0-preview.1-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-preview.2-resolute, 11.0-preview-resolute, 11.0.0-preview.2, 11.0-preview | [Dockerfile](src/aspnet/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-preview.2-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-preview.2-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-composite-arm32v7, 11.0-preview-resolute-chiseled-composite-arm32v7, 11.0.0-preview.2-resolute-chiseled-composite, 11.0-preview-resolute-chiseled-composite | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-composite-extra-arm32v7, 11.0-preview-resolute-chiseled-composite-extra-arm32v7, 11.0.0-preview.2-resolute-chiseled-composite-extra, 11.0-preview-resolute-chiseled-composite-extra | [Dockerfile](src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.2-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-composite-arm32v7, 11.0-preview-alpine3.23-composite-arm32v7, 11.0-preview-alpine-composite-arm32v7, 11.0.0-preview.2-alpine3.23-composite, 11.0-preview-alpine3.23-composite, 11.0-preview-alpine-composite | [Dockerfile](src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-composite-extra-arm32v7, 11.0-preview-alpine3.23-composite-extra-arm32v7, 11.0-preview-alpine-composite-extra-arm32v7, 11.0.0-preview.2-alpine3.23-composite-extra, 11.0-preview-alpine3.23-composite-extra, 11.0-preview-alpine-composite-extra | [Dockerfile](src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile) | Alpine 3.23 ### Windows amd64 Tags @@ -333,8 +333,8 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.0-preview.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile) | Nano Server 2025 -11.0.0-preview.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile) | Windows Server Core 2025 +11.0.0-preview.2-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile) | Nano Server 2025 +11.0.0-preview.2-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile) | Windows Server Core 2025 diff --git a/README.runtime-deps.md b/README.runtime-deps.md index 7039221cf9..f5980505a1 100644 --- a/README.runtime-deps.md +++ b/README.runtime-deps.md @@ -104,14 +104,14 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.0-preview.1-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-preview.1-resolute, 11.0-preview-resolute, 11.0.0-preview.1, 11.0-preview | [Dockerfile](src/runtime-deps/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-preview.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-preview.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-preview.2-resolute, 11.0-preview-resolute, 11.0.0-preview.2, 11.0-preview | [Dockerfile](src/runtime-deps/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-preview.2-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-preview.2-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.2-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.2-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.2-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.2-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 ### Linux arm64 Tags @@ -157,14 +157,14 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.0-preview.1-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-preview.1-resolute, 11.0-preview-resolute, 11.0.0-preview.1, 11.0-preview | [Dockerfile](src/runtime-deps/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-preview.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-preview.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-preview.2-resolute, 11.0-preview-resolute, 11.0.0-preview.2, 11.0-preview | [Dockerfile](src/runtime-deps/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-preview.2-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-preview.2-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.2-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.2-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.2-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.2-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime-deps/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 ### Linux arm32 Tags @@ -198,11 +198,11 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.0-preview.1-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-preview.1-resolute, 11.0-preview-resolute, 11.0.0-preview.1, 11.0-preview | [Dockerfile](src/runtime-deps/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-preview.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-preview.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-preview.2-resolute, 11.0-preview-resolute, 11.0.0-preview.2, 11.0-preview | [Dockerfile](src/runtime-deps/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-preview.2-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-preview.2-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime-deps/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.2-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime-deps/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23 diff --git a/README.runtime.md b/README.runtime.md index 402900a8a5..7113db9b9c 100644 --- a/README.runtime.md +++ b/README.runtime.md @@ -111,14 +111,14 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.0-preview.1-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-preview.1-resolute, 11.0-preview-resolute, 11.0.0-preview.1, 11.0-preview | [Dockerfile](src/runtime/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-preview.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-preview.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.0-preview.2-resolute, 11.0-preview-resolute, 11.0.0-preview.2, 11.0-preview | [Dockerfile](src/runtime/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-amd64, 11.0-preview-resolute-chiseled-amd64, 11.0.0-preview.2-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/amd64/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-extra-amd64, 11.0-preview-resolute-chiseled-extra-amd64, 11.0.0-preview.2-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.0-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-extra-amd64, 11.0-preview-alpine3.23-extra-amd64, 11.0-preview-alpine-extra-amd64, 11.0.0-preview.2-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.0-preview.2-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-amd64, 11.0-preview-azurelinux3.0-distroless-amd64, 11.0.0-preview.2-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-extra-amd64, 11.0-preview-azurelinux3.0-distroless-extra-amd64, 11.0.0-preview.2-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile) | Azure Linux 3.0 ### Linux arm64 Tags @@ -164,14 +164,14 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.0-preview.1-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-preview.1-resolute, 11.0-preview-resolute, 11.0.0-preview.1, 11.0-preview | [Dockerfile](src/runtime/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-preview.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-preview.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.1-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 -11.0.0-preview.1-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.1-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.0-preview.2-resolute, 11.0-preview-resolute, 11.0.0-preview.2, 11.0-preview | [Dockerfile](src/runtime/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-arm64v8, 11.0-preview-resolute-chiseled-arm64v8, 11.0.0-preview.2-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-extra-arm64v8, 11.0-preview-resolute-chiseled-extra-arm64v8, 11.0.0-preview.2-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.0-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-extra-arm64v8, 11.0-preview-alpine3.23-extra-arm64v8, 11.0-preview-alpine-extra-arm64v8, 11.0.0-preview.2-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.0-preview.2-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-arm64v8, 11.0-preview-azurelinux3.0-distroless-arm64v8, 11.0.0-preview.2-azurelinux3.0-distroless, 11.0-preview-azurelinux3.0-distroless | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.0-preview.2-azurelinux3.0-distroless-extra-arm64v8, 11.0-preview-azurelinux3.0-distroless-extra-arm64v8, 11.0.0-preview.2-azurelinux3.0-distroless-extra, 11.0-preview-azurelinux3.0-distroless-extra | [Dockerfile](src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile) | Azure Linux 3.0 ### Linux arm32 Tags @@ -205,11 +205,11 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.0-preview.1-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-preview.1-resolute, 11.0-preview-resolute, 11.0.0-preview.1, 11.0-preview | [Dockerfile](src/runtime/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-preview.1-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-preview.1-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.0-preview.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23 -11.0.0-preview.1-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.1-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.0-preview.2-resolute, 11.0-preview-resolute, 11.0.0-preview.2, 11.0-preview | [Dockerfile](src/runtime/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-arm32v7, 11.0-preview-resolute-chiseled-arm32v7, 11.0.0-preview.2-resolute-chiseled, 11.0-preview-resolute-chiseled | [Dockerfile](src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-resolute-chiseled-extra-arm32v7, 11.0-preview-resolute-chiseled-extra-arm32v7, 11.0.0-preview.2-resolute-chiseled-extra, 11.0-preview-resolute-chiseled-extra | [Dockerfile](src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.0-preview.2-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.0-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/runtime/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23 +11.0.0-preview.2-alpine3.23-extra-arm32v7, 11.0-preview-alpine3.23-extra-arm32v7, 11.0-preview-alpine-extra-arm32v7, 11.0.0-preview.2-alpine3.23-extra, 11.0-preview-alpine3.23-extra, 11.0-preview-alpine-extra | [Dockerfile](src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile) | Alpine 3.23 ### Windows amd64 Tags @@ -236,8 +236,8 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.0-preview.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile) | Nano Server 2025 -11.0.0-preview.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile) | Windows Server Core 2025 +11.0.0-preview.2-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile) | Nano Server 2025 +11.0.0-preview.2-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile) | Windows Server Core 2025 diff --git a/README.sdk.md b/README.sdk.md index ac346edc99..fd869931f8 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -91,12 +91,12 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.100-preview.1-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.100-preview.1-resolute, 11.0-preview-resolute, 11.0.100-preview.1, 11.0-preview | [Dockerfile](src/sdk/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04 -11.0.100-preview.1-resolute-aot-amd64, 11.0-preview-resolute-aot-amd64, 11.0.100-preview.1-resolute-aot, 11.0-preview-resolute-aot, 11.0.100-preview.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/resolute-aot/amd64/Dockerfile) | Ubuntu 26.04 -11.0.100-preview.1-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.100-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23 -11.0.100-preview.1-alpine3.23-aot-amd64, 11.0-preview-alpine3.23-aot-amd64, 11.0-preview-alpine-aot-amd64, 11.0.100-preview.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile) | Alpine 3.23 -11.0.100-preview.1-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.100-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 -11.0.100-preview.1-azurelinux3.0-aot-amd64, 11.0-preview-azurelinux3.0-aot-amd64, 11.0.100-preview.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0 +11.0.100-preview.2-resolute-amd64, 11.0-preview-resolute-amd64, 11.0.100-preview.2-resolute, 11.0-preview-resolute, 11.0.100-preview.2, 11.0-preview | [Dockerfile](src/sdk/11.0/resolute/amd64/Dockerfile) | Ubuntu 26.04 +11.0.100-preview.2-resolute-aot-amd64, 11.0-preview-resolute-aot-amd64, 11.0.100-preview.2-resolute-aot, 11.0-preview-resolute-aot, 11.0.100-preview.2-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/resolute-aot/amd64/Dockerfile) | Ubuntu 26.04 +11.0.100-preview.2-alpine3.23-amd64, 11.0-preview-alpine3.23-amd64, 11.0-preview-alpine-amd64, 11.0.100-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/amd64/Dockerfile) | Alpine 3.23 +11.0.100-preview.2-alpine3.23-aot-amd64, 11.0-preview-alpine3.23-aot-amd64, 11.0-preview-alpine-aot-amd64, 11.0.100-preview.2-alpine3.23-aot, 11.0-preview-alpine3.23-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile) | Alpine 3.23 +11.0.100-preview.2-azurelinux3.0-amd64, 11.0-preview-azurelinux3.0-amd64, 11.0.100-preview.2-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/amd64/Dockerfile) | Azure Linux 3.0 +11.0.100-preview.2-azurelinux3.0-aot-amd64, 11.0-preview-azurelinux3.0-aot-amd64, 11.0.100-preview.2-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile) | Azure Linux 3.0 ### Linux arm64 Tags @@ -126,12 +126,12 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.100-preview.1-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.100-preview.1-resolute, 11.0-preview-resolute, 11.0.100-preview.1, 11.0-preview | [Dockerfile](src/sdk/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.100-preview.1-resolute-aot-arm64v8, 11.0-preview-resolute-aot-arm64v8, 11.0.100-preview.1-resolute-aot, 11.0-preview-resolute-aot, 11.0.100-preview.1-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/resolute-aot/arm64v8/Dockerfile) | Ubuntu 26.04 -11.0.100-preview.1-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.100-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23 -11.0.100-preview.1-alpine3.23-aot-arm64v8, 11.0-preview-alpine3.23-aot-arm64v8, 11.0-preview-alpine-aot-arm64v8, 11.0.100-preview.1-alpine3.23-aot, 11.0-preview-alpine3.23-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile) | Alpine 3.23 -11.0.100-preview.1-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.100-preview.1-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 -11.0.100-preview.1-azurelinux3.0-aot-arm64v8, 11.0-preview-azurelinux3.0-aot-arm64v8, 11.0.100-preview.1-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.100-preview.2-resolute-arm64v8, 11.0-preview-resolute-arm64v8, 11.0.100-preview.2-resolute, 11.0-preview-resolute, 11.0.100-preview.2, 11.0-preview | [Dockerfile](src/sdk/11.0/resolute/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.100-preview.2-resolute-aot-arm64v8, 11.0-preview-resolute-aot-arm64v8, 11.0.100-preview.2-resolute-aot, 11.0-preview-resolute-aot, 11.0.100-preview.2-aot, 11.0-preview-aot | [Dockerfile](src/sdk/11.0/resolute-aot/arm64v8/Dockerfile) | Ubuntu 26.04 +11.0.100-preview.2-alpine3.23-arm64v8, 11.0-preview-alpine3.23-arm64v8, 11.0-preview-alpine-arm64v8, 11.0.100-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/arm64v8/Dockerfile) | Alpine 3.23 +11.0.100-preview.2-alpine3.23-aot-arm64v8, 11.0-preview-alpine3.23-aot-arm64v8, 11.0-preview-alpine-aot-arm64v8, 11.0.100-preview.2-alpine3.23-aot, 11.0-preview-alpine3.23-aot, 11.0-preview-alpine-aot | [Dockerfile](src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile) | Alpine 3.23 +11.0.100-preview.2-azurelinux3.0-arm64v8, 11.0-preview-azurelinux3.0-arm64v8, 11.0.100-preview.2-azurelinux3.0, 11.0-preview-azurelinux3.0 | [Dockerfile](src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile) | Azure Linux 3.0 +11.0.100-preview.2-azurelinux3.0-aot-arm64v8, 11.0-preview-azurelinux3.0-aot-arm64v8, 11.0.100-preview.2-azurelinux3.0-aot, 11.0-preview-azurelinux3.0-aot | [Dockerfile](src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile) | Azure Linux 3.0 ### Linux arm32 Tags @@ -153,8 +153,8 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.100-preview.1-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.100-preview.1-resolute, 11.0-preview-resolute, 11.0.100-preview.1, 11.0-preview | [Dockerfile](src/sdk/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04 -11.0.100-preview.1-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.100-preview.1-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23 +11.0.100-preview.2-resolute-arm32v7, 11.0-preview-resolute-arm32v7, 11.0.100-preview.2-resolute, 11.0-preview-resolute, 11.0.100-preview.2, 11.0-preview | [Dockerfile](src/sdk/11.0/resolute/arm32v7/Dockerfile) | Ubuntu 26.04 +11.0.100-preview.2-alpine3.23-arm32v7, 11.0-preview-alpine3.23-arm32v7, 11.0-preview-alpine-arm32v7, 11.0.100-preview.2-alpine3.23, 11.0-preview-alpine3.23, 11.0-preview-alpine | [Dockerfile](src/sdk/11.0/alpine3.23/arm32v7/Dockerfile) | Alpine 3.23 ### Windows amd64 Tags @@ -181,8 +181,8 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version ---- | ---------- | ---------- -11.0.100-preview.1-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile) | Nano Server 2025 -11.0.100-preview.1-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile) | Windows Server Core 2025 +11.0.100-preview.2-nanoserver-ltsc2025, 11.0-preview-nanoserver-ltsc2025 | [Dockerfile](src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile) | Nano Server 2025 +11.0.100-preview.2-windowsservercore-ltsc2025, 11.0-preview-windowsservercore-ltsc2025 | [Dockerfile](src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile) | Windows Server Core 2025 diff --git a/eng/docker-tools/CHANGELOG.md b/eng/docker-tools/CHANGELOG.md new file mode 100644 index 0000000000..7903acd810 --- /dev/null +++ b/eng/docker-tools/CHANGELOG.md @@ -0,0 +1,76 @@ +# Docker Tools / ImageBuilder Changelog + +All breaking changes and new features in `eng/docker-tools` will be documented in this file. + +--- + +## 2026-02-19: Separate Registry Endpoints from Authentication + +- Pull request: [#1945](https://github.com/dotnet/docker-tools/pull/1945) +- Issue: [#1914](https://github.com/dotnet/docker-tools/issues/1914) + +Authentication details (`serviceConnection`, `resourceGroup`, `subscription`) have been moved from individual registry endpoints into a centralized `RegistryAuthentication` list. +This fixes an issue where ACR authentication could fail when multiple service connections existed for the same registry. + +**Before:** Each registry endpoint embedded its own authentication: + +```yaml +publishConfig: + BuildRegistry: + server: $(acr.server) + repoPrefix: "my-prefix/" + resourceGroup: $(resourceGroup) + subscription: $(subscription) + serviceConnection: + name: $(serviceConnectionName) + id: $(serviceConnection.id) + clientId: $(serviceConnection.clientId) + tenantId: $(tenant) + PublishRegistry: + server: $(acr.server) + repoPrefix: "publish/" + resourceGroup: $(resourceGroup) + subscription: $(subscription) + serviceConnection: + name: $(publishServiceConnectionName) + id: $(publishServiceConnection.id) + clientId: $(publishServiceConnection.clientId) + tenantId: $(tenant) +``` + +**After:** Registry endpoints only contain `server` and `repoPrefix`. Authentication is centralized: + +```yaml +publishConfig: + BuildRegistry: + server: $(acr.server) + repoPrefix: "my-prefix/" + PublishRegistry: + server: $(acr.server) + repoPrefix: "publish/" + RegistryAuthentication: + - server: $(acr.server) + resourceGroup: $(resourceGroup) + subscription: $(subscription) + serviceConnection: + name: $(serviceConnectionName) + id: $(serviceConnection.id) + clientId: $(serviceConnection.clientId) + tenantId: $(tenant) +``` + +How to update: +- Update any publishConfig parameters to match the new structure. + - Multiple registries can share authentication. If two registries use the same ACR server, only one entry is needed in `RegistryAuthentication`. + - The new structure should match [ImageBuilder's Configuration Model](https://github.com/dotnet/docker-tools/tree/a82572386854f15af441c50c6efa698a627e9f2b/src/ImageBuilder/Configuration). +- Update service connection setup (if using `setup-service-connections.yml`): + - The template now supports looking up service connections from `publishConfig.RegistryAuthentication` + - Use the new `usesRegistries` parameter to specify which registries need auth setup: + ```yaml + - template: eng/docker-tools/templates/stages/setup-service-connections.yml + parameters: + publishConfig: ${{ variables.publishConfig }} + usesRegistries: + - $(buildRegistry.server) + - $(publishRegistry.server) + ``` diff --git a/eng/docker-tools/templates/jobs/build-images.yml b/eng/docker-tools/templates/jobs/build-images.yml index db9b4f7fd8..025d3c8d00 100644 --- a/eng/docker-tools/templates/jobs/build-images.yml +++ b/eng/docker-tools/templates/jobs/build-images.yml @@ -91,8 +91,6 @@ jobs: --architecture $(architecture) --retry --digests-out-var 'builtImages' - --acr-subscription '${{ parameters.publishConfig.BuildRegistry.subscription }}' - --acr-resource-group '${{ parameters.publishConfig.BuildRegistry.resourceGroup }}' $(manifestVariables) $(imageBuilderBuildArgs) - template: /eng/docker-tools/templates/steps/publish-artifact.yml@self diff --git a/eng/docker-tools/templates/jobs/publish.yml b/eng/docker-tools/templates/jobs/publish.yml index 98e29f4a76..b86ec1ee2d 100644 --- a/eng/docker-tools/templates/jobs/publish.yml +++ b/eng/docker-tools/templates/jobs/publish.yml @@ -97,8 +97,6 @@ jobs: internalProjectName: ${{ parameters.internalProjectName }} args: >- copyAcrImages - '${{ parameters.publishConfig.BuildRegistry.subscription }}' - '${{ parameters.publishConfig.BuildRegistry.resourceGroup }}' '${{ parameters.publishConfig.BuildRegistry.repoPrefix }}' '${{ parameters.publishConfig.BuildRegistry.server }}' --os-type '*' diff --git a/eng/docker-tools/templates/stages/build-and-test.yml b/eng/docker-tools/templates/stages/build-and-test.yml index 3f7118ab3a..1e39a998ea 100644 --- a/eng/docker-tools/templates/stages/build-and-test.yml +++ b/eng/docker-tools/templates/stages/build-and-test.yml @@ -3,11 +3,13 @@ parameters: testMatrixType: platformVersionedOs buildMatrixCustomBuildLegGroupArgs: "" testMatrixCustomBuildLegGroupArgs: "" - customCopyBaseImagesInitSteps: [] - customGenerateMatrixInitSteps: [] # Custom steps to set up ImageBuilder instead of pulling from MCR (e.g., bootstrap from source). # Runs before ImageBuilder pull. If non-empty, skips the default ImageBuilder pull. customInitSteps: [] + # Custom steps that run after ImageBuilder is set up but before copy-base-images runs. + customCopyBaseImagesInitSteps: [] + # Custom steps that run after ImageBuilder is set up but before matrix generation runs. + customGenerateMatrixInitSteps: [] # Custom steps that run after ImageBuilder is set up but before the build starts. # Use for build-specific initialization (e.g., setting variables, additional setup). customBuildInitSteps: [] diff --git a/eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml b/eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml index 424f3aaf5d..6f3e4995d6 100644 --- a/eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml +++ b/eng/docker-tools/templates/stages/dotnet/publish-config-nonprod.yml @@ -53,35 +53,44 @@ stages: InternalMirrorRegistry: server: $(acr-staging-test.server) repoPrefix: $(internalMirrorRepoPrefix) - resourceGroup: $(testResourceGroup) - subscription: $(testSubscription) - serviceConnection: - name: $(internal-mirror-test.serviceConnectionName) - id: $(internal-mirror-test.serviceConnection.id) - clientId: $(internal-mirror-test.serviceConnection.clientId) - tenantId: $(testTenant) PublicMirrorRegistry: server: $(public-mirror.server) repoPrefix: $(publicMirrorRepoPrefix) - resourceGroup: $(public-mirror.resourceGroup) - subscription: $(public-mirror.subscription) - serviceConnection: - name: $(public-mirror.serviceConnectionName) - id: $(public-mirror.serviceConnection.id) - tenantId: $(public-mirror.serviceConnection.tenantId) - clientId: $(public-mirror.serviceConnection.clientId) BuildRegistry: server: $(acr-staging-test.server) - resourceGroup: $(testResourceGroup) - subscription: $(testSubscription) repoPrefix: "${{ parameters.stagingRepoPrefix }}${{ parameters.sourceBuildPipelineRunId }}/" - serviceConnection: - name: $(build-test.serviceConnectionName) - id: $(build-test.serviceConnection.id) - clientId: $(build-test.serviceConnection.clientId) - tenantId: $(testTenant) + + PublishRegistry: + server: $(acr-test.server) + repoPrefix: "${{ parameters.publishRepoPrefix }}" + + RegistryAuthentication: + - server: $(acr-staging-test.server) + resourceGroup: $(testResourceGroup) + subscription: $(testSubscription) + serviceConnection: + name: $(build-test.serviceConnectionName) + id: $(build-test.serviceConnection.id) + clientId: $(build-test.serviceConnection.clientId) + tenantId: $(testTenant) + - server: $(public-mirror.server) + resourceGroup: $(public-mirror.resourceGroup) + subscription: $(public-mirror.subscription) + serviceConnection: + name: $(public-mirror.serviceConnectionName) + id: $(public-mirror.serviceConnection.id) + tenantId: $(public-mirror.serviceConnection.tenantId) + clientId: $(public-mirror.serviceConnection.clientId) + - server: $(acr-test.server) + resourceGroup: $(testResourceGroup) + subscription: $(testSubscription) + serviceConnection: + name: $(publish-test.serviceConnectionName) + id: $(publish-test.serviceConnection.id) + clientId: $(publish-test.serviceConnection.clientId) + tenantId: $(testTenant) cleanServiceConnection: name: $(clean-test.serviceConnectionName) @@ -94,14 +103,3 @@ stages: id: $(test-nonprod.serviceConnection.id) clientId: $(test-nonprod.serviceConnection.clientId) tenantId: $(testTenant) - - PublishRegistry: - server: $(acr-test.server) - resourceGroup: $(testResourceGroup) - subscription: $(testSubscription) - repoPrefix: "${{ parameters.publishRepoPrefix }}" - serviceConnection: - name: $(publish-test.serviceConnectionName) - id: $(publish-test.serviceConnection.id) - clientId: $(publish-test.serviceConnection.clientId) - tenantId: $(testTenant) diff --git a/eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml b/eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml index 7f9a4e0071..24746b3aea 100644 --- a/eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml +++ b/eng/docker-tools/templates/stages/dotnet/publish-config-prod.yml @@ -53,35 +53,44 @@ stages: InternalMirrorRegistry: server: $(acr-staging.server) repoPrefix: $(internalMirrorRepoPrefix) - resourceGroup: $(acr-staging.resourceGroup) - subscription: $(acr-staging.subscription) - serviceConnection: - name: $(internal-mirror.serviceConnectionName) - id: $(internal-mirror.serviceConnection.id) - clientId: $(internal-mirror.serviceConnection.clientId) - tenantId: $(internal-mirror.serviceConnection.tenantId) PublicMirrorRegistry: server: $(public-mirror.server) repoPrefix: $(publicMirrorRepoPrefix) - resourceGroup: $(public-mirror.resourceGroup) - subscription: $(public-mirror.subscription) - serviceConnection: - name: $(public-mirror.serviceConnectionName) - id: $(public-mirror.serviceConnection.id) - tenantId: $(public-mirror.serviceConnection.tenantId) - clientId: $(public-mirror.serviceConnection.clientId) BuildRegistry: server: $(acr-staging.server) - resourceGroup: $(acr-staging.resourceGroup) - subscription: $(acr-staging.subscription) repoPrefix: "${{ parameters.stagingRepoPrefix }}${{ parameters.sourceBuildPipelineRunId }}/" - serviceConnection: - name: $(build.serviceConnectionName) - id: $(build.serviceConnection.id) - clientId: $(build.serviceConnection.clientId) - tenantId: $(build.serviceConnection.tenantId) + + PublishRegistry: + server: $(acr.server) + repoPrefix: "${{ parameters.publishRepoPrefix }}" + + RegistryAuthentication: + - server: $(acr-staging.server) + resourceGroup: $(acr-staging.resourceGroup) + subscription: $(acr-staging.subscription) + serviceConnection: + name: $(build.serviceConnectionName) + id: $(build.serviceConnection.id) + clientId: $(build.serviceConnection.clientId) + tenantId: $(build.serviceConnection.tenantId) + - server: $(public-mirror.server) + resourceGroup: $(public-mirror.resourceGroup) + subscription: $(public-mirror.subscription) + serviceConnection: + name: $(public-mirror.serviceConnectionName) + id: $(public-mirror.serviceConnection.id) + tenantId: $(public-mirror.serviceConnection.tenantId) + clientId: $(public-mirror.serviceConnection.clientId) + - server: $(acr.server) + resourceGroup: $(acr.resourceGroup) + subscription: $(acr.subscription) + serviceConnection: + name: $(publish.serviceConnectionName) + id: $(publish.serviceConnection.id) + clientId: $(publish.serviceConnection.clientId) + tenantId: $(publish.serviceConnection.tenantId) cleanServiceConnection: name: $(clean.serviceConnectionName) @@ -94,14 +103,3 @@ stages: id: $(test.serviceConnection.id) clientId: $(test.serviceConnection.clientId) tenantId: $(test.serviceConnection.tenantId) - - PublishRegistry: - server: $(acr.server) - resourceGroup: $(acr.resourceGroup) - subscription: $(acr.subscription) - repoPrefix: "${{ parameters.publishRepoPrefix }}" - serviceConnection: - name: $(publish.serviceConnectionName) - id: $(publish.serviceConnection.id) - clientId: $(publish.serviceConnection.clientId) - tenantId: $(publish.serviceConnection.tenantId) diff --git a/eng/docker-tools/templates/stages/setup-service-connections.yml b/eng/docker-tools/templates/stages/setup-service-connections.yml index 2ef74e90c5..405bc703ac 100644 --- a/eng/docker-tools/templates/stages/setup-service-connections.yml +++ b/eng/docker-tools/templates/stages/setup-service-connections.yml @@ -3,6 +3,10 @@ # it is declared in this stage's parameters, even if your pipeline has already # been granted access to the service connection. This stage also does not need # to complete before the service connection is used. +# +# There are two ways to specify service connections: +# - Pass `serviceConnections` directly (list of {name: string} objects) +# - Pass `publishConfig` + `registries` to look up auth from RegistryAuthentication parameters: - name: pool type: object @@ -10,14 +14,26 @@ parameters: name: $(default1ESInternalPoolName) image: $(default1ESInternalPoolImage) os: linux -# serviceConnections object shape: -# - name: string + +# Explicit list of service connections to initialize +# Shape: [{ name: string }] - name: serviceConnections type: object default: [] -stages: +# List of registry servers that need authentication. These will be looked up in +# publishConfig.RegistryAuthentication. +# Make sure to provide the publishConfig parameter. +- name: usesRegistries + type: object + default: [] +# Look up service connections from publishConfig based on registries +# The publish configuration containing RegistryAuthentication entries. +- name: publishConfig + type: object + default: {} +stages: - stage: SetupServiceConnectionsStage displayName: Setup service connections jobs: @@ -27,6 +43,8 @@ stages: pool: ${{ parameters.pool }} steps: - checkout: none + + # Direct service connections list - ${{ each serviceConnection in parameters.serviceConnections }}: - task: AzureCLI@2 displayName: Setup ${{ serviceConnection.name }} @@ -36,3 +54,15 @@ stages: scriptLocation: inlineScript inlineScript: | az account show + + # Setup registry service connections + - ${{ if gt(length(parameters.usesRegistries), 0) }}: + - ${{ each auth in parameters.publishConfig.RegistryAuthentication }}: + - ${{ if containsValue(parameters.usesRegistries, auth.server) }}: + - task: AzureCLI@2 + displayName: Setup ${{ auth.serviceConnection.name }} + inputs: + azureSubscription: ${{ auth.serviceConnection.name }} + scriptType: pscore + scriptLocation: inlineScript + inlineScript: az account show diff --git a/eng/docker-tools/templates/steps/clean-acr-images.yml b/eng/docker-tools/templates/steps/clean-acr-images.yml index 65b8ceffac..2f4b53ade1 100644 --- a/eng/docker-tools/templates/steps/clean-acr-images.yml +++ b/eng/docker-tools/templates/steps/clean-acr-images.yml @@ -5,7 +5,6 @@ parameters: age: null customArgs: "--dry-run" internalProjectName: null - publishConfig: null steps: - template: /eng/docker-tools/templates/steps/run-imagebuilder.yml@self parameters: @@ -20,8 +19,6 @@ steps: args: >- cleanAcrImages ${{ parameters.repo }} - ${{ parameters.acr.subscription }} - ${{ parameters.acr.resourceGroup }} ${{ parameters.acr.server }} --action ${{ parameters.action }} --age ${{ parameters.age }} diff --git a/eng/docker-tools/templates/steps/copy-base-images.yml b/eng/docker-tools/templates/steps/copy-base-images.yml index 0e9e09f688..6664c8f9af 100644 --- a/eng/docker-tools/templates/steps/copy-base-images.yml +++ b/eng/docker-tools/templates/steps/copy-base-images.yml @@ -3,8 +3,6 @@ parameters: type: object default: server: "" - subscription: "" - resourceGroup: "" repoPrefix: "" - name: additionalOptions type: string @@ -29,8 +27,6 @@ steps: # error args: >- copyBaseImages - '${{ parameters.acr.subscription }}' - '${{ parameters.acr.resourceGroup }}' $(dockerHubRegistryCreds) $(customCopyBaseImagesArgs) --repo-prefix '${{ parameters.acr.repoPrefix }}' diff --git a/eng/docker-tools/templates/variables/docker-images.yml b/eng/docker-tools/templates/variables/docker-images.yml index b932703539..86b50eb984 100644 --- a/eng/docker-tools/templates/variables/docker-images.yml +++ b/eng/docker-tools/templates/variables/docker-images.yml @@ -1,5 +1,5 @@ variables: - imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2887966 + imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2914488 imageNames.imageBuilder: $(imageNames.imageBuilderName) imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId) imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux3.0-docker-testrunner diff --git a/eng/dockerfile-templates/Dockerfile.download-dotnet b/eng/dockerfile-templates/Dockerfile.download-dotnet index d745e77736..b984f99295 100644 --- a/eng/dockerfile-templates/Dockerfile.download-dotnet +++ b/eng/dockerfile-templates/Dockerfile.download-dotnet @@ -46,7 +46,8 @@ Public stable builds still use build versions for paths but stable versions for filenames. Public unstable builds use build versions for both paths and filenames. ^ set isStableVersion to find(buildVersion, "alpha") < 0 && find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^ - set fileVersion to when(isStableVersion, productVersion, buildVersion) ^ + set useFinalVersion to VARIABLES[cat(baseUrlType, "|", dotnetVersion, "|use-final-version")] = "true" ^ + set fileVersion to when(isStableVersion, productVersion, when(useFinalVersion, cat(productVersion, ".final"), buildVersion)) ^ set archiveExtension to when(isWindows, ".zip", ".tar.gz") ^ @@ -155,6 +156,16 @@ "dotnet_build_version")), buildVersion )^_ +}}}}{{if (useFinalVersion && !isStableVersion):{{lineEnd}} +{{continue}}{{ + assign( + when(product = "aspnet" || product = "aspnet-composite", + "aspnetcore_file_version", + when(product = "sdk", + "dotnet_sdk_file_version", + "dotnet_file_version")), + fileVersion + )^_ }}}}{{if runtimeVersion:{{lineEnd}} {{continue}}{{ assign("dotnet_version", runtimeVersion) diff --git a/eng/dockerfile-templates/aspnet/Dockerfile.envs b/eng/dockerfile-templates/aspnet/Dockerfile.envs index ebabad80de..391b1ec2f6 100644 --- a/eng/dockerfile-templates/aspnet/Dockerfile.envs +++ b/eng/dockerfile-templates/aspnet/Dockerfile.envs @@ -9,13 +9,20 @@ && find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^ + set useFinalVersion to VARIABLES[cat("dotnet|", dotnetVersion, "|use-final-version")] = "true" ^ + set productVersion to VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")] ^ + set runtimeVersion to when(isStableBranding, - VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], - VARIABLES[cat("runtime|", dotnetVersion, "|build-version")]) ^ + productVersion, + when(useFinalVersion, + cat(productVersion, ".final"), + VARIABLES[cat("runtime|", dotnetVersion, "|build-version")])) ^ set aspnetVersion to when(isStableBranding, - VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], - VARIABLES[cat("aspnet|", dotnetVersion, "|build-version")]) ^ + productVersion, + when(useFinalVersion, + cat(productVersion, ".final"), + VARIABLES[cat("aspnet|", dotnetVersion, "|build-version")])) ^ set isWindows to find(OS_VERSION, "nanoserver") >= 0 || find(OS_VERSION, "windowsservercore") >= 0 ^ set lineContinuation to when(isWindows, "`", "\") ^ diff --git a/eng/dockerfile-templates/runtime/Dockerfile.envs b/eng/dockerfile-templates/runtime/Dockerfile.envs index 8c4cee0ae2..9352711889 100644 --- a/eng/dockerfile-templates/runtime/Dockerfile.envs +++ b/eng/dockerfile-templates/runtime/Dockerfile.envs @@ -8,9 +8,12 @@ find(buildVersion, "alpha") < 0 && find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^ + set useFinalVersion to VARIABLES[cat("dotnet|", dotnetVersion, "|use-final-version")] = "true" ^ set runtimeVersion to when(isStableBranding, VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], - buildVersion) + when(useFinalVersion, + cat(VARIABLES[cat("dotnet|", dotnetVersion, "|product-version")], ".final"), + buildVersion)) }}# .NET Runtime version {{if ARGS["is-standalone"]:ENV }}DOTNET_VERSION={{runtimeVersion}} diff --git a/eng/dockerfile-templates/sdk/Dockerfile.envs b/eng/dockerfile-templates/sdk/Dockerfile.envs index d57580f859..5fc01988f4 100644 --- a/eng/dockerfile-templates/sdk/Dockerfile.envs +++ b/eng/dockerfile-templates/sdk/Dockerfile.envs @@ -9,9 +9,12 @@ && find(buildVersion, "preview") < 0 && find(buildVersion, "rc.") < 0 ^ + set useFinalVersion to VARIABLES[cat("sdk|", dotnetVersion, "|use-final-version")] = "true" ^ set sdkVersion to when(isStableBranding, VARIABLES[cat("sdk|", dotnetVersion, "|product-version")], - VARIABLES[cat("sdk|", dotnetVersion, "|build-version")]) ^ + when(useFinalVersion, + cat(VARIABLES[cat("sdk|", dotnetVersion, "|product-version")], ".final"), + VARIABLES[cat("sdk|", dotnetVersion, "|build-version")])) ^ set isAlpine to find(OS_VERSION, "alpine") >= 0 ^ set isWindows to find(OS_VERSION, "nanoserver") >= 0 || find(OS_VERSION, "windowsservercore") >= 0 ^ set lineContinuation to when(isWindows, "`", "\") ^ diff --git a/eng/pipelines/pipelines/update-dependencies-internal.yml b/eng/pipelines/pipelines/update-dependencies-internal.yml index bc537e2d7a..31be1fa870 100644 --- a/eng/pipelines/pipelines/update-dependencies-internal.yml +++ b/eng/pipelines/pipelines/update-dependencies-internal.yml @@ -1,8 +1,9 @@ parameters: -# Stage container name (e.g., "stage-1234567") to fetch updates from. This can be -# from the real staging pipeline or the staging test pipeline, but the -# stagingStorageAccount parameter must match which pipeline is used here. -- name: stageContainer +# Comma-delimited list of stage container names (e.g., "stage-1234567,stage-2345678") +# to fetch updates from. This can be from the real staging pipeline or the staging +# test pipeline, but the stagingStorageAccount parameter must match which pipeline +# is used here. +- name: stageContainers type: string default: "" # Staging storage account for .NET release artifacts @@ -31,6 +32,8 @@ extends: parameters: dependencyName: dotnet updateSteps: + - ${{ if eq(parameters.stageContainers, '') }}: + - "stageContainers parameter must not be empty.": error - task: AzureCLI@2 displayName: Update .NET continueOnError: False @@ -42,7 +45,7 @@ extends: inlineScript: >- dotnet run --project eng/update-dependencies/update-dependencies.csproj -- from-staging-pipeline - ${{ parameters.stageContainer }} + "${{ parameters.stageContainers }}" --mode Remote --azdo-organization "$(System.CollectionUri)" --azdo-project "$(System.TeamProject)" diff --git a/eng/pipelines/stages/build-and-test.yml b/eng/pipelines/stages/build-and-test.yml index 5f7547ce73..da30d979f5 100644 --- a/eng/pipelines/stages/build-and-test.yml +++ b/eng/pipelines/stages/build-and-test.yml @@ -44,11 +44,13 @@ stages: - ${{ if parameters.isStandaloneBuild }}: - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self parameters: + publishConfig: ${{ parameters.publishConfig }} + usesRegistries: + - ${{ parameters.publishConfig.InternalMirrorRegistry.server }} + - ${{ parameters.publishConfig.BuildRegistry.server }} serviceConnections: - - name: ${{ parameters.publishConfig.InternalMirrorRegistry.serviceConnection.name }} - - name: ${{ parameters.publishConfig.BuildRegistry.serviceConnection.name }} - - ${{ if parameters.storageAccountServiceConnection }}: - - name: ${{ parameters.storageAccountServiceConnection.name }} + - ${{ if parameters.storageAccountServiceConnection }}: + - name: ${{ parameters.storageAccountServiceConnection.name }} - template: /eng/docker-tools/templates/stages/dotnet/build-and-test.yml@self parameters: diff --git a/eng/pipelines/stages/build-test-publish-repo.yml b/eng/pipelines/stages/build-test-publish-repo.yml index 7e1d04893a..d6790b0d8a 100644 --- a/eng/pipelines/stages/build-test-publish-repo.yml +++ b/eng/pipelines/stages/build-test-publish-repo.yml @@ -36,12 +36,14 @@ stages: - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self parameters: + publishConfig: ${{ parameters.publishConfig }} + usesRegistries: + - ${{ parameters.publishConfig.InternalMirrorRegistry.server }} + - ${{ parameters.publishConfig.BuildRegistry.server }} + - ${{ parameters.publishConfig.PublishRegistry.server }} serviceConnections: - - name: ${{ parameters.publishConfig.InternalMirrorRegistry.serviceConnection.name }} - - name: ${{ parameters.publishConfig.BuildRegistry.serviceConnection.name }} - - name: ${{ parameters.publishConfig.PublishRegistry.serviceConnection.name }} - - ${{ each serviceConnection in parameters.additionalServiceConnections }}: - - name: ${{ serviceConnection.name }} + - ${{ each serviceConnection in parameters.additionalServiceConnections }}: + - name: ${{ serviceConnection.name }} - template: /eng/pipelines/stages/build-and-test.yml@self parameters: diff --git a/eng/pipelines/stages/publish.yml b/eng/pipelines/stages/publish.yml index f4d20bb028..d80fb09a4c 100644 --- a/eng/pipelines/stages/publish.yml +++ b/eng/pipelines/stages/publish.yml @@ -39,10 +39,12 @@ stages: - ${{ if parameters.isStandalonePublish }}: - template: /eng/docker-tools/templates/stages/setup-service-connections.yml@self parameters: + publishConfig: ${{ parameters.publishConfig }} + usesRegistries: + - ${{ parameters.publishConfig.PublishRegistry.server }} serviceConnections: - - name: ${{ parameters.publishConfig.PublishRegistry.serviceConnection.name }} - - ${{ each serviceConnection in parameters.additionalServiceConnections }}: - - name: ${{ serviceConnection.name }} + - ${{ each serviceConnection in parameters.additionalServiceConnections }}: + - name: ${{ serviceConnection.name }} - template: /eng/docker-tools/templates/stages/dotnet/publish.yml@self parameters: diff --git a/eng/pipelines/update-dependencies-internal-official.yml b/eng/pipelines/update-dependencies-internal-official.yml index 56df087fe7..651e98625c 100644 --- a/eng/pipelines/update-dependencies-internal-official.yml +++ b/eng/pipelines/update-dependencies-internal-official.yml @@ -1,6 +1,14 @@ trigger: none pr: none +parameters: +# Comma-delimited list of stage container names (e.g., "stage-1234567,stage-2345678") +# Each stage container will be processed in sequence. +- name: stageContainers + type: string + default: "" + displayName: Comma-delimited list of stage containers to process + variables: - template: /eng/docker-tools/templates/variables/dotnet/common.yml@self # This pipeline expects there to be a variable named "targetBranch" defined @@ -9,19 +17,10 @@ variables: # It is not a parameter since it needs to be permanent but also changed to the # next release branch every month without modifying the pipeline YAML. -resources: - pipelines: - # All release pipelines are located at: https://dev.azure.com/dnceng/internal/_build?definitionScope=%5Cdotnet%5Crelease - # Stage-DotNet-Prepare-Artifacts: https://dev.azure.com/dnceng/internal/_build?definitionId=1300 - # Stage-DotNet-Prepare-Artifacts-Test: https://dev.azure.com/dnceng/internal/_build?definitionId=1286 - - pipeline: "dotnet-staging-pipeline" - source: "Stage-DotNet-Prepare-Artifacts" - trigger: true - extends: template: /eng/pipelines/pipelines/update-dependencies-internal.yml@self parameters: - stageContainer: "stage-$(resources.pipeline.dotnet-staging-pipeline.runID)" + stageContainers: "${{ parameters.stageContainers }}" stagingStorageAccount: "dotnetstage" targetBranch: "$(targetBranch)" gitServiceConnectionName: "$(updateDepsInt.serviceConnectionName)" diff --git a/eng/pipelines/update-dependencies-internal-unofficial.yml b/eng/pipelines/update-dependencies-internal-unofficial.yml index 44fafd52f2..6bacf7f6ae 100644 --- a/eng/pipelines/update-dependencies-internal-unofficial.yml +++ b/eng/pipelines/update-dependencies-internal-unofficial.yml @@ -6,25 +6,20 @@ parameters: type: string default: "nightly" displayName: Target branch for dependency update pull request. +# Comma-delimited list of stage container names (e.g., "stage-1234567,stage-2345678") +# Each stage container will be processed in sequence. +- name: stageContainers + type: string + default: "" + displayName: Comma-delimited list of stage containers to process variables: - template: /eng/docker-tools/templates/variables/dotnet/common.yml@self -resources: - pipelines: - # All release pipelines are located at: https://dev.azure.com/dnceng/internal/_build?definitionScope=%5Cdotnet%5Crelease - # Stage-DotNet-Prepare-Artifacts: https://dev.azure.com/dnceng/internal/_build?definitionId=1300 - # Stage-DotNet-Prepare-Artifacts-Test: https://dev.azure.com/dnceng/internal/_build?definitionId=1286 - - pipeline: "dotnet-staging-pipeline" - # Although this pipeline is "unofficial", it uses the production staging pipeline as a resource - # since we don't actually need to download any .NET artifacts from it in order to update this - # repo, so there's no risk in using the real versions. - source: "Stage-DotNet-Prepare-Artifacts" - extends: template: /eng/pipelines/pipelines/update-dependencies-internal.yml@self parameters: - stageContainer: "stage-$(resources.pipeline.dotnet-staging-pipeline.runID)" + stageContainers: "${{ parameters.stageContainers }}" stagingStorageAccount: "dotnetstage" targetBranch: "${{ parameters.targetBranch }}" gitServiceConnectionName: "$(updateDepsInt-test.serviceConnectionName)" diff --git a/eng/update-dependencies/FromStagingPipelineCommand.cs b/eng/update-dependencies/FromStagingPipelineCommand.cs index 7e5ede5e77..28c3e9e60e 100644 --- a/eng/update-dependencies/FromStagingPipelineCommand.cs +++ b/eng/update-dependencies/FromStagingPipelineCommand.cs @@ -11,10 +11,14 @@ namespace Dotnet.Docker; internal partial class FromStagingPipelineCommand : BaseCommand { /// - /// Callback that stages all changes, commits them, pushes them to the - /// remote, and creates a pull request. + /// Callback that stages all changes and commits them. /// - private delegate Task CommitAndCreatePullRequest(string commitMessage, string prTitle, string prBody); + private delegate Task CommitChanges(string commitMessage); + + /// + /// Callback that pushes all commits and creates a pull request. + /// + private delegate Task PushAndCreatePullRequest(string prTitle, string prBody); private readonly ILogger _logger; private readonly IPipelineArtifactProvider _pipelineArtifactProvider; @@ -44,17 +48,73 @@ public FromStagingPipelineCommand( public override async Task ExecuteAsync(FromStagingPipelineOptions options) { + var stageContainers = options.GetStageContainerList(); + + if (stageContainers.Count == 0) + { + _logger.LogError("No stage containers provided."); + return 1; + } + + _logger.LogInformation( + "Updating dependencies based on {Count} stage container(s): {StageContainers}", + stageContainers.Count, + string.Join(", ", stageContainers)); + // Delegate all git responsibilities to GitRepoContext. Depending on what options were // passed in, we may or may not want to actually perform git operations. GitRepoContext // decides what git operations to perform and tells us where to make changes. This keeps // all the git-related logic in one place. var gitRepoContext = await _createGitRepoContextAsync(options); - _logger.LogInformation( - "Updating dependencies based on stage container {StageContainer}", - options.StageContainer); + List commitMessages = []; + List prBodySections = []; + + // Process each stage container, creating a separate commit for each + foreach (var stageContainer in stageContainers) + { + _logger.LogInformation("Processing stage container: {StageContainer}", stageContainer); + + var (commitMessage, prBodySection, exitCode) = await ProcessStageContainerAsync( + options, + stageContainer, + gitRepoContext); + + if (exitCode != 0) + { + return exitCode; + } + + // Commit changes for this stage container + await gitRepoContext.CommitChanges(commitMessage); + + commitMessages.Add(commitMessage); + prBodySections.Add(prBodySection); + } - var stagingPipelineRunId = options.GetStagingPipelineRunId(); + // Create pull request with all commits + var prTitle = stageContainers.Count == 1 + ? $"[{options.TargetBranch}] {commitMessages[0]}" + : $"[{options.TargetBranch}] Update .NET dependencies from {stageContainers.Count} stage containers"; + + var prBody = string.Join(Environment.NewLine + Environment.NewLine, prBodySections); + await gitRepoContext.PushAndCreatePullRequest(prTitle, prBody); + + return 0; + } + + /// + /// Processes a single stage container and applies the updates. + /// + /// + /// A tuple containing the commit message, PR body section, and exit code. + /// + private async Task<(string CommitMessage, string PrBodySection, int ExitCode)> ProcessStageContainerAsync( + FromStagingPipelineOptions options, + string stageContainer, + GitRepoContext gitRepoContext) + { + var stagingPipelineRunId = StagingPipelineOptionsExtensions.GetStagingPipelineRunId(stageContainer); // Log staging pipeline tags for diagnostic purposes var stagingPipelineTags = await _pipelinesService.GetBuildTagsAsync( @@ -68,15 +128,15 @@ public override async Task ExecuteAsync(FromStagingPipelineOptions options) { ArgumentException.ThrowIfNullOrWhiteSpace( options.StagingStorageAccount, - $"{FromStagingPipelineOptions.StagingStorageAccountOption} must be set when using the {FromStagingPipelineOptions.InternalOption} option." + $"{FromStagingPipelineOptions.StagingStorageAccountOptionName} must be set when using the {FromStagingPipelineOptions.InternalOption} option." ); // Release metadata is stored in metadata/ReleaseManifest.json. // Release assets are stored individually under in assets/shipping/assets/[Sdk|Runtime|aspnetcore|...]. // Full example: https://dotnetstagetest.blob.core.windows.net/stage-2XXXXXX/assets/shipping/assets/Runtime/10.0.0-preview.N.XXXXX.YYY/dotnet-runtime-10.0.0-preview.N.XXXXX.YYY-linux-arm64.tar.gz - _buildLabelService.AddBuildTags($"Container - {options.StageContainer}"); + _buildLabelService.AddBuildTags($"Container - {stageContainer}"); internalBaseUrl = NormalizeStorageAccountUrl(options.StagingStorageAccount) - + $"/{options.StageContainer}/assets/shipping/assets"; + + $"/{stageContainer}/assets/shipping/assets"; } var releaseConfig = await _pipelineArtifactProvider.GetReleaseConfigAsync( @@ -94,7 +154,7 @@ public override async Task ExecuteAsync(FromStagingPipelineOptions options) _internalVersionsService.RecordInternalStagingBuild( repoRoot: gitRepoContext.LocalRepoPath, dotNetVersion: dotNetVersion, - stageContainer: options.StageContainer); + stageContainer: stageContainer); } var productVersions = (options.Internal, releaseConfig.SdkOnly) switch @@ -141,7 +201,7 @@ public override async Task ExecuteAsync(FromStagingPipelineOptions options) var buildUrl = $"{options.AzdoOrganization}/{options.AzdoProject}/_build/results?buildId={stagingPipelineRunId}"; _logger.LogInformation( "Applying internal build {StageContainer} ({BuildUrl})", - options.StageContainer, buildUrl); + stageContainer, buildUrl); _logger.LogInformation( "Ignore any git-related logging output below, because git " @@ -163,8 +223,8 @@ public override async Task ExecuteAsync(FromStagingPipelineOptions options) _logger.LogError( "Failed to apply stage container {StageContainer}. " + "Command exited with code {ExitCode}.", - options.StageContainer, exitCode); - return exitCode; + stageContainer, exitCode); + return (string.Empty, string.Empty, exitCode); } var commitMessage = releaseConfig switch @@ -173,18 +233,18 @@ public override async Task ExecuteAsync(FromStagingPipelineOptions options) _ => $"Update .NET {majorMinorVersionString} to {productVersions["sdk"]} SDK / {productVersions["runtime"]} Runtime", }; - var prTitle = $"[{options.TargetBranch}] {commitMessage}"; var newVersionsList = productVersions.Select(kvp => $"- {kvp.Key.ToUpper()}: {kvp.Value}"); - var prBody = $""" - This pull request updates .NET {majorMinorVersionString} to the following versions: + var prBodySection = $""" + ## .NET {majorMinorVersionString} + + This updates .NET {majorMinorVersionString} to the following versions: {string.Join(Environment.NewLine, newVersionsList)} - These versions are from .NET staging pipeline run [{options.StageContainer}]({buildUrl}). + These versions are from .NET staging pipeline run [{stageContainer}]({buildUrl}). """; - await gitRepoContext.CommitAndCreatePullRequest(commitMessage, prTitle, prBody); - return 0; + return (commitMessage, prBodySection, 0); } /// @@ -215,13 +275,18 @@ private static string NormalizeStorageAccountUrl(string storageAccount) /// Holds context about the git repository where changes should be made. /// /// Root of the repo where all changes should be made. - /// Callback that creates a pull request with all changes. - private record GitRepoContext(string LocalRepoPath, CommitAndCreatePullRequest CommitAndCreatePullRequest) + /// Callback that commits changes with the given message. + /// Callback that pushes all commits and creates a pull request. + private record GitRepoContext( + string LocalRepoPath, + CommitChanges CommitChanges, + PushAndCreatePullRequest PushAndCreatePullRequest) { /// /// Sets up the remote/local git repository based on . /// Call this before making any changes, then make changes to - /// and use to create a pull request. + /// and use to commit each change individually, + /// then use to push all commits and create a pull request. /// /// /// If is , @@ -233,7 +298,8 @@ public static async Task CreateAsync( FromStagingPipelineOptions options, IEnvironmentService environmentService) { - CommitAndCreatePullRequest createPullRequest; + CommitChanges commitChanges; + PushAndCreatePullRequest pushAndCreatePullRequest; string localRepoPath; if (options.Mode == ChangeMode.Remote) @@ -241,7 +307,12 @@ public static async Task CreateAsync( var remoteUrl = options.GetAzdoRepoUrl(); var targetBranch = options.TargetBranch; var buildId = environmentService.GetBuildId() ?? ""; - var prBranch = options.CreatePrBranchName($"update-deps-int-{options.StageContainer}", buildId); + var stageContainerList = options.GetStageContainerList(); + if (stageContainerList.Count == 0) + { + throw new ArgumentException("At least one stage container must be provided."); + } + var prBranch = options.CreatePrBranchName($"update-deps-int-{stageContainerList[0]}", buildId); var committer = options.GetCommitterIdentity(); // Clone the repo and configure git identity for commits @@ -253,10 +324,15 @@ public static async Task CreateAsync( await git.Local.CreateAndCheckoutLocalBranchAsync(prBranch); localRepoPath = git.Local.LocalPath; - createPullRequest = async (commitMessage, prTitle, prBody) => + + commitChanges = async (commitMessage) => { await git.Local.StageAsync("."); await git.Local.CommitAsync(commitMessage, committer); + }; + + pushAndCreatePullRequest = async (prTitle, prBody) => + { await git.PushLocalBranchAsync(prBranch); await git.Remote.CreatePullRequestAsync(new( Title: prTitle, @@ -270,16 +346,22 @@ await git.Remote.CreatePullRequestAsync(new( { logger.LogInformation("No git operations will be performed in {Mode} mode.", options.Mode); localRepoPath = options.RepoRoot; - createPullRequest = async (commitMessage, prTitle, prBody) => + + commitChanges = async (commitMessage) => { - logger.LogInformation("Skipping commit and pull request creation in {Mode} mode.", options.Mode); + logger.LogInformation("Skipping commit in {Mode} mode.", options.Mode); logger.LogInformation("Commit message: {CommitMessage}", commitMessage); + }; + + pushAndCreatePullRequest = async (prTitle, prBody) => + { + logger.LogInformation("Skipping push and pull request creation in {Mode} mode.", options.Mode); logger.LogInformation("Pull request title: {PullRequestTitle}", prTitle); logger.LogInformation("Pull request body:\n{PullRequestBody}", prBody); }; } - return new GitRepoContext(localRepoPath, createPullRequest); + return new GitRepoContext(localRepoPath, commitChanges, pushAndCreatePullRequest); } } } diff --git a/eng/update-dependencies/FromStagingPipelineOptions.cs b/eng/update-dependencies/FromStagingPipelineOptions.cs index d2bf427656..faeefe6987 100644 --- a/eng/update-dependencies/FromStagingPipelineOptions.cs +++ b/eng/update-dependencies/FromStagingPipelineOptions.cs @@ -12,9 +12,10 @@ internal partial record FromStagingPipelineOptions : CreatePullRequestOptions, I public const string InternalOption = "--internal"; /// - /// The stage container name (e.g., "stage-1234567") to use as a source for the update. + /// A comma-delimited list of stage container names (e.g., "stage-1234567,stage-2345678") + /// to use as a source for the update. /// - public required string StageContainer { get; init; } + public required string StageContainers { get; init; } /// /// Whether or not to use the internal versions of the staged build. @@ -34,10 +35,10 @@ internal partial record FromStagingPipelineOptions : CreatePullRequestOptions, I public static new List Arguments { get; } = [ - new Argument("stage-container") + new Argument("stage-containers") { Arity = ArgumentArity.ExactlyOne, - Description = "The stage container name to use as a source for the update (e.g., 'stage-1234567')" + Description = "A comma-delimited list of stage container names to use as a source for the update (e.g., 'stage-1234567,stage-2345678')" }, ..CreatePullRequestOptions.Arguments, ]; @@ -67,6 +68,16 @@ internal partial record FromStagingPipelineOptions : CreatePullRequestOptions, I }, ..CreatePullRequestOptions.Options, ]; + + /// + /// Parses the comma-delimited list of stage containers and returns them as a list. + /// + public IReadOnlyList GetStageContainerList() + { + return StageContainers + .Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries) + .ToList(); + } } internal static partial class StagingPipelineOptionsExtensions @@ -80,13 +91,13 @@ internal static partial class StagingPipelineOptionsExtensions /// /// Thrown if the stage container name is not in the expected format. /// - public static int GetStagingPipelineRunId(this FromStagingPipelineOptions options) + public static int GetStagingPipelineRunId(string stageContainer) { - var match = StageContainerRegex.Match(options.StageContainer); + var match = StageContainerRegex.Match(stageContainer); if (!match.Success) { throw new ArgumentException( - $"Invalid stage container name '{options.StageContainer}'. Expected format: 'stage-{{buildId}}' (e.g., 'stage-1234567')"); + $"Invalid stage container name '{stageContainer}'. Expected format: 'stage-{{buildId}}' (e.g., 'stage-1234567')"); } return int.Parse(match.Groups[1].Value); } diff --git a/eng/update-dependencies/NuGetConfigUpdater.cs b/eng/update-dependencies/NuGetConfigUpdater.cs index 7f4786749c..e8d1f65bb1 100644 --- a/eng/update-dependencies/NuGetConfigUpdater.cs +++ b/eng/update-dependencies/NuGetConfigUpdater.cs @@ -89,10 +89,16 @@ private static string ToStringWithDeclaration(XDocument doc) return builder.ToString(); } + /// + /// Updates the packageSourceCredentials section of the NuGet.config for the current version's package source. + /// Credentials are only needed for internal, non-public-preview builds which use authenticated feeds. + /// Public preview builds use public feeds, so their credentials are removed if present. + /// Only the current version's entry is modified — other versions' credentials are left intact. + /// private void UpdatePackageSourceCredentials(DotNetVersion sdkVersion, string pkgSrcName, XElement configuration) { XElement? pkgSourceCreds = configuration.Element("packageSourceCredentials"); - if (_options.IsInternal && !sdkVersion.IsPublicPreview) + if (_options.IsInternal) { pkgSourceCreds = GetOrCreateXObject( pkgSourceCreds, @@ -108,7 +114,14 @@ private void UpdatePackageSourceCredentials(DotNetVersion sdkVersion, string pkg } else { - pkgSourceCreds?.Remove(); + // Only remove the credentials entry for the current version's package source, + // leaving credentials for other versions intact (e.g. a non-preview version + // may still need authenticated access even if this preview version doesn't). + pkgSourceCreds?.Element(pkgSrcName)?.Remove(); + if (pkgSourceCreds is not null && !pkgSourceCreds.HasElements) + { + pkgSourceCreds.Remove(); + } } } @@ -123,13 +136,10 @@ private void UpdatePackageSources(DotNetVersion sdkVersion, string pkgSrcName, X createNode: () => new XElement("packageSources") ); - // Public preview versions have builds and NuGet feeds in the public prior to release. - string project = sdkVersion.IsPublicPreview ? "public" : "internal"; - UpdateAddElement( parentElement: pkgSources, key: pkgSrcName, - value: $"https://pkgs.dev.azure.com/dnceng/{project}/_packaging/{sdkVersion}-shipping/nuget/v3/index.json" + value: $"https://pkgs.dev.azure.com/dnceng/internal/_packaging/{sdkVersion}-shipping/nuget/v3/index.json" ); } else diff --git a/eng/update-dependencies/SpecificCommand.cs b/eng/update-dependencies/SpecificCommand.cs index ea9a2043e4..5d1e2f85e6 100644 --- a/eng/update-dependencies/SpecificCommand.cs +++ b/eng/update-dependencies/SpecificCommand.cs @@ -274,12 +274,15 @@ await prCreator.CreateOrUpdateAsync( } else { - UpdateExistingGitHubPullRequest(gitHubAuth, prOptions, commitMessage, upstreamBranch); + await UpdateExistingGitHubPullRequestAsync( + client, upstreamProject, pullRequestToUpdate.Number, + gitHubAuth, prOptions, commitMessage, upstreamBranch); } } } - private static void UpdateExistingGitHubPullRequest( + private static async Task UpdateExistingGitHubPullRequestAsync( + GitHubClient client, GitHubProject upstreamProject, int pullRequestNumber, GitHubAuth gitHubAuth, PullRequestOptions prOptions, string commitMessage, GitHubBranch upstreamBranch) { // PullRequestCreator ends up force-pushing updates to an existing PR which is not great when the logic @@ -308,13 +311,46 @@ private static void UpdateExistingGitHubPullRequest( // Clone the PR's repo/branch to a temp location Repository.Clone($"https://github.com/{gitHubAuth.User}/{Options.GitHubProject}", tempRepoPath, cloneOptions); + using Repository repo = new(tempRepoPath); + + // Add upstream remote and fetch the target branch so we can find the merge base + string upstreamUrl = $"https://github.com/{Options.GitHubUpstreamOwner}/{Options.GitHubProject}"; + repo.Network.Remotes.Add("upstream", upstreamUrl); + Commands.Fetch(repo, "upstream", [$"refs/heads/{upstreamBranch.Name}:refs/remotes/upstream/{upstreamBranch.Name}"], null, null); + + // Check for non-bot commits on the PR branch. If someone other than the bot + // has pushed commits, we should not overwrite them. + List nonBotCommits = GetNonBotCommits(repo, upstreamBranch.Name); + if (nonBotCommits.Count > 0) + { + Trace.WriteLine($"Found {nonBotCommits.Count} non-bot commit(s) on the PR branch - skipping update."); + + string localCommand = BuildLocalUpdateCommand(); + string nonBotCommitList = string.Join("\n", nonBotCommits.Select(c => $"- {c}")); + string comment = $""" + Automatic update skipped because additional commits were detected on this branch: + + {nonBotCommitList} + + To apply this update manually, run: + + ``` + {localCommand} + ``` + + To allow automatic updates to resume, merge or close this PR. + """; + + await client.PostCommentAsync(upstreamProject, pullRequestNumber, comment); + return; + } + // Remove all existing directories and files from the temp repo ClearRepoContents(tempRepoPath); // Copy contents of local repo changes to temp repo DirectoryCopy(".", tempRepoPath); - using Repository repo = new(tempRepoPath); RepositoryStatus status = repo.RetrieveStatus(new StatusOptions()); // If there are any changes from what exists in the PR @@ -355,6 +391,78 @@ private static void UpdateExistingGitHubPullRequest( } } + /// + /// Finds commits on the current branch that were not authored by the bot user. + /// Walks the commit log from HEAD back to the merge base with the target branch. + /// + private static List GetNonBotCommits(Repository repo, string targetBranchName) + { + List nonBotCommits = []; + + Branch? targetBranch = repo.Branches[$"upstream/{targetBranchName}"]; + if (targetBranch is null) + { + Trace.WriteLine($"Could not find remote tracking branch 'upstream/{targetBranchName}' - skipping non-bot commit check."); + return nonBotCommits; + } + + Commit headCommit = repo.Head.Tip; + Commit targetCommit = targetBranch.Tip; + + Commit? mergeBase = repo.ObjectDatabase.FindMergeBase(headCommit, targetCommit); + if (mergeBase is null) + { + Trace.WriteLine("Could not find merge base - skipping non-bot commit check."); + return nonBotCommits; + } + + foreach (Commit commit in repo.Commits) + { + if (commit.Sha == mergeBase.Sha) + { + break; + } + + if (!string.Equals(commit.Author.Name, Options.User, StringComparison.OrdinalIgnoreCase)) + { + nonBotCommits.Add($"`{commit.Sha[..7]}` {commit.MessageShort} (by {commit.Author.Name})"); + } + } + + return nonBotCommits; + } + + /// + /// Builds a CLI command string that can be run locally to apply the same dependency update. + /// Uses the specific subcommand with already-resolved versions, so no BAR auth is needed. + /// + private static string BuildLocalUpdateCommand() + { + List parts = + [ + "dotnet run --project eng/update-dependencies/update-dependencies.csproj --", + "specific", + Options.DockerfileVersion, + ]; + + foreach (var (name, version) in Options.ProductVersions) + { + parts.Add($"--product-version {name}={version}"); + } + + foreach (string tool in Options.Tools) + { + parts.Add($"--tool {tool}"); + } + + if (!string.IsNullOrEmpty(Options.VersionSourceName)) + { + parts.Add($"--version-source-name '{Options.VersionSourceName}'"); + } + + return string.Join(" ", parts); + } + private static void DeleteRepoDirectory(string repoPath) { if (Directory.Exists(repoPath)) diff --git a/eng/update-dependencies/Sync/SyncInternalReleaseCommand.cs b/eng/update-dependencies/Sync/SyncInternalReleaseCommand.cs index b2d342eece..67b9b2a310 100644 --- a/eng/update-dependencies/Sync/SyncInternalReleaseCommand.cs +++ b/eng/update-dependencies/Sync/SyncInternalReleaseCommand.cs @@ -201,7 +201,7 @@ private async Task ApplyInternalBuildAsync( { RepoRoot = localRepo.LocalPath, Internal = true, - StageContainer = stageContainer, + StageContainers = stageContainer, StagingStorageAccount = stagingStorageAccount, AzdoOrganization = options.AzdoOrganization, AzdoProject = options.AzdoProject, diff --git a/manifest.versions.json b/manifest.versions.json index 3840679149..359f3caff1 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -4,12 +4,12 @@ "base-url|public|maintenance|main": "https://builds.dotnet.microsoft.com/dotnet", "base-url|public|maintenance|nightly": "https://builds.dotnet.microsoft.com/dotnet", - "base-url|public|preview|main": "https://builds.dotnet.microsoft.com/dotnet", + "base-url|public|preview|main": "https://ci.dot.net/public", "base-url|public|preview|nightly": "https://ci.dot.net/public", "base-url|public-checksums|maintenance|main": "https://builds.dotnet.microsoft.com/dotnet", "base-url|public-checksums|maintenance|nightly": "https://builds.dotnet.microsoft.com/dotnet", - "base-url|public-checksums|preview|main": "https://builds.dotnet.microsoft.com/dotnet", + "base-url|public-checksums|preview|main": "https://ci.dot.net/public-checksums", "base-url|public-checksums|preview|nightly": "https://ci.dot.net/public-checksums", "alpine|floating-tag-version": "alpine3.23", @@ -37,10 +37,10 @@ "aspnet|10.0|build-version": "10.0.3", "aspnet-composite|10.0|build-version": "$(aspnet|10.0|build-version)", - "aspnet|11.0|build-version": "11.0.0-preview.1.26104.118", + "aspnet|11.0|build-version": "11.0.0-preview.2.26155.102", "aspnet-composite|11.0|build-version": "$(aspnet|11.0|build-version)", - "chisel|latest|build-version": "v1.3.0", + "chisel|latest|build-version": "v1.4.0", "chisel|latest|x64|url": "https://github.com/canonical/chisel/releases/download/$(chisel|latest|build-version)/chisel_$(chisel|latest|build-version)_linux_amd64.tar.gz", "chisel|latest|arm|url": "https://github.com/canonical/chisel/releases/download/$(chisel|latest|build-version)/chisel_$(chisel|latest|build-version)_linux_arm.tar.gz", "chisel|latest|arm64|url": "https://github.com/canonical/chisel/releases/download/$(chisel|latest|build-version)/chisel_$(chisel|latest|build-version)_linux_arm64.tar.gz", @@ -57,9 +57,9 @@ "chisel|8.0|arm|url": "$(chisel|latest|arm|url)", "chisel|8.0|arm64|url": "$(chisel|latest|arm64|url)", - "chisel|latest|x64|sha384": "8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9", - "chisel|latest|arm|sha384": "fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb", - "chisel|latest|arm64|sha384": "5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b", + "chisel|latest|x64|sha384": "e6d3210880eab61524dd83768278afffeb42ec49820b4263a2c5d9f5898c07ee3cbcb4699bae7878370c965b32527820", + "chisel|latest|arm|sha384": "5edcb99020507325747b00314b85b6cf321238b99ebd5f3e6fe9f2315723c54f1b18fe066f5f9d55fe79bf1862d70997", + "chisel|latest|arm64|sha384": "bc2caf1fac6463982ff0770ae5e7aa51f37307d281c1ca56d3ef9068c30434b254dc72739f7d2689a2e7975923eff1ff", "chisel|11.0|x64|sha384": "$(chisel|latest|x64|sha384)", "chisel|11.0|arm|sha384": "$(chisel|latest|arm|sha384)", "chisel|11.0|arm64|sha384": "$(chisel|latest|arm64|sha384)", @@ -99,20 +99,21 @@ "dotnet|10.0|base-url|checksums|main": "$(base-url|public|maintenance|main)", "dotnet|10.0|base-url|checksums|nightly": "$(base-url|public|maintenance|nightly)", - "dotnet|11.0|product-version": "11.0.0-preview.1", + "dotnet|11.0|product-version": "11.0.0-preview.2", "dotnet|11.0|fixed-tag": "$(dotnet|11.0|product-version)", "dotnet|11.0|minor-tag": "11.0-preview", "dotnet|11.0|base-url|main": "$(base-url|public|preview|main)", "dotnet|11.0|base-url|nightly": "$(base-url|public|preview|nightly)", "dotnet|11.0|base-url|checksums|main": "$(base-url|public-checksums|preview|main)", "dotnet|11.0|base-url|checksums|nightly": "$(base-url|public-checksums|preview|nightly)", + "dotnet|11.0|use-final-version": "true", "libicu|bookworm": 72, "libicu|bullseye": 67, "libicu|focal": 66, "libicu|jammy": 70, "libicu|noble": 74, - "libicu|resolute": 76, + "libicu|resolute": 78, "libssl|alpine3.22": "3", "libssl|alpine3.23": "3", @@ -216,7 +217,7 @@ "runtime|8.0|build-version": "8.0.24", "runtime|9.0|build-version": "9.0.13", "runtime|10.0|build-version": "10.0.3", - "runtime|11.0|build-version": "11.0.0-preview.1.26104.118", + "runtime|11.0|build-version": "11.0.0-preview.2.26155.102", "sdk|8.0|build-version": "8.0.418", "sdk|8.0|product-version": "8.0.418", @@ -245,17 +246,18 @@ "sdk|10.0|fixed-tag": "$(sdk|10.0|product-version)", "sdk|10.0|minor-tag": "$(dotnet|10.0|minor-tag)", - "sdk|11.0|build-version": "11.0.100-preview.1.26104.118", - "sdk|11.0|product-version": "11.0.100-preview.1", + "sdk|11.0|build-version": "11.0.100-preview.2.26155.102", + "sdk|11.0|product-version": "11.0.100-preview.2", "sdk|11.0|base-url|main": "$(dotnet|11.0|base-url|main)", "sdk|11.0|base-url|nightly": "$(dotnet|11.0|base-url|nightly)", "sdk|11.0|base-url|checksums|main": "$(dotnet|11.0|base-url|checksums|main)", "sdk|11.0|base-url|checksums|nightly": "$(dotnet|11.0|base-url|checksums|nightly)", + "sdk|11.0|use-final-version": "$(dotnet|11.0|use-final-version)", "sdk|11.0|fixed-tag": "$(sdk|11.0|product-version)", "sdk|11.0|minor-tag": "$(dotnet|11.0|minor-tag)", "syft|repo": "anchore/syft", - "syft|version": "v1.41.1", + "syft|version": "v1.42.1", "syft|tag": "$(syft|version)-debug" } } diff --git a/src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile index 14aa9de953..36d48fb32b 100644 --- a/src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile +++ b/src/aspnet/11.0/alpine3.23-composite-extra/amd64/Dockerfile @@ -1,29 +1,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-amd64 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-amd64 AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-amd64 +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-amd64 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile index 00319ea925..d07b429190 100644 --- a/src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile +++ b/src/aspnet/11.0/alpine3.23-composite-extra/arm32v7/Dockerfile @@ -1,29 +1,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm32v7 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm32v7 AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm32v7 +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm32v7 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile index 9c558baca3..35e484290c 100644 --- a/src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile +++ b/src/aspnet/11.0/alpine3.23-composite-extra/arm64v8/Dockerfile @@ -1,29 +1,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm64v8 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm64v8 AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm64v8 +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm64v8 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile index 2fd30e60d5..5fa98a98e8 100644 --- a/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile +++ b/src/aspnet/11.0/alpine3.23-composite/amd64/Dockerfile @@ -1,29 +1,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-amd64 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-amd64 AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-alpine3.23-amd64 +FROM $REPO:11.0.0-preview.2-alpine3.23-amd64 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile index 35e59c8a85..b35e7b2f11 100644 --- a/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile +++ b/src/aspnet/11.0/alpine3.23-composite/arm32v7/Dockerfile @@ -1,29 +1,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm32v7 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-arm32v7 AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm32v7 +FROM $REPO:11.0.0-preview.2-alpine3.23-arm32v7 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile index 38ae14cfe0..b6fb3d8ad2 100644 --- a/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile +++ b/src/aspnet/11.0/alpine3.23-composite/arm64v8/Dockerfile @@ -1,29 +1,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm64v8 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-arm64v8 AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm64v8 +FROM $REPO:11.0.0-preview.2-alpine3.23-arm64v8 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] RUN ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet diff --git a/src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile index 6f26b1a067..31e2a8fd54 100644 --- a/src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile +++ b/src/aspnet/11.0/alpine3.23-extra/amd64/Dockerfile @@ -1,25 +1,26 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-amd64 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-amd64 AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-amd64 +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile index 76cf01d3bc..6ccd4e6f78 100644 --- a/src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile +++ b/src/aspnet/11.0/alpine3.23-extra/arm32v7/Dockerfile @@ -1,25 +1,26 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm32v7 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm32v7 AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm32v7 +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm32v7 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile index 3daa6841e1..853fd3db72 100644 --- a/src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile +++ b/src/aspnet/11.0/alpine3.23-extra/arm64v8/Dockerfile @@ -1,25 +1,26 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm64v8 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm64v8 AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm64v8 +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/alpine3.23/amd64/Dockerfile b/src/aspnet/11.0/alpine3.23/amd64/Dockerfile index 86274683bd..a18fc38b6f 100644 --- a/src/aspnet/11.0/alpine3.23/amd64/Dockerfile +++ b/src/aspnet/11.0/alpine3.23/amd64/Dockerfile @@ -1,25 +1,26 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-amd64 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-amd64 AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-alpine3.23-amd64 +FROM $REPO:11.0.0-preview.2-alpine3.23-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile b/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile index e569d2aafd..26cf06be3a 100644 --- a/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile +++ b/src/aspnet/11.0/alpine3.23/arm32v7/Dockerfile @@ -1,25 +1,26 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm32v7 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-arm32v7 AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm32v7 +FROM $REPO:11.0.0-preview.2-alpine3.23-arm32v7 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile b/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile index 879681b33c..aefc3558d8 100644 --- a/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile +++ b/src/aspnet/11.0/alpine3.23/arm64v8/Dockerfile @@ -1,25 +1,26 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm64v8 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-arm64v8 AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ + https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm64v8 +FROM $REPO:11.0.0-preview.2-alpine3.23-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile index 3cd8ad665b..cd985a22f2 100644 --- a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile +++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/amd64/Dockerfile @@ -10,29 +10,30 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-extra-amd64 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-extra-amd64 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile index 1671399f9a..210c77e00f 100644 --- a/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile +++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite-extra/arm64v8/Dockerfile @@ -10,29 +10,30 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-extra-arm64v8 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-extra-arm64v8 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile index cdb037260d..f34ce7f7e4 100644 --- a/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile +++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite/amd64/Dockerfile @@ -10,29 +10,30 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-amd64 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-amd64 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile index 2e94e61f8d..59cb8f2461 100644 --- a/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile +++ b/src/aspnet/11.0/azurelinux3.0-distroless-composite/arm64v8/Dockerfile @@ -10,29 +10,30 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-arm64v8 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-arm64v8 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile index 0d5e8aeb99..c8d857457f 100644 --- a/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile +++ b/src/aspnet/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -10,22 +10,23 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-extra-amd64 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-extra-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile index 80ab8a2b7c..bcdfcbeaf7 100644 --- a/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile +++ b/src/aspnet/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -10,22 +10,23 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-extra-arm64v8 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-extra-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile index 4a2dbbe498..fea7ca599f 100644 --- a/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile +++ b/src/aspnet/11.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -10,22 +10,23 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-amd64 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile index 68d954ffee..c0d712aca4 100644 --- a/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile +++ b/src/aspnet/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -10,22 +10,23 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-arm64v8 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile b/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile index f55601cf02..3346dfb9ac 100644 --- a/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile +++ b/src/aspnet/11.0/azurelinux3.0/amd64/Dockerfile @@ -1,29 +1,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-amd64 AS installer +FROM $REPO:11.0.0-preview.2-azurelinux3.0-amd64 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-amd64 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile index de20f17972..5cbdfef04e 100644 --- a/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile +++ b/src/aspnet/11.0/azurelinux3.0/arm64v8/Dockerfile @@ -1,29 +1,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime # Installer image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-arm64v8 AS installer +FROM $REPO:11.0.0-preview.2-azurelinux3.0-arm64v8 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-arm64v8 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile index a9ea590dc4..a827426f0b 100644 --- a/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile +++ b/src/aspnet/11.0/nanoserver-ltsc2025/amd64/Dockerfile @@ -10,12 +10,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $aspnetcore_version = '11.0.0-preview.1.26104.118'; ` - $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $aspnetcore_file + '.sha512-bare'; ` + $aspnetcore_version = '11.0.0-preview.2.26155.102'; ` + $aspnetcore_file_version = '11.0.0-preview.2.final'; ` + $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_file_version + '-win-x64.zip'; ` + $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $aspnetcore_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -30,9 +31,9 @@ RUN powershell -Command ` # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-nanoserver-ltsc2025 +FROM $REPO:11.0.0-preview.2-nanoserver-ltsc2025 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile index f5f3c34be8..8e3d5b525a 100644 --- a/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/amd64/Dockerfile @@ -4,29 +4,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM amd64/buildpack-deps:resolute-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-extra-amd64 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-extra-amd64 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile index 630f15122d..86527b23ef 100644 --- a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm32v7/Dockerfile @@ -4,29 +4,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-extra-arm32v7 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-extra-arm32v7 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile index d08e070aba..191926406f 100644 --- a/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled-composite-extra/arm64v8/Dockerfile @@ -4,29 +4,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm64v8/buildpack-deps:resolute-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-extra-arm64v8 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-extra-arm64v8 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile index 0523e3c931..98f932af79 100644 --- a/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled-composite/amd64/Dockerfile @@ -4,29 +4,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM amd64/buildpack-deps:resolute-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-amd64 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-amd64 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile index be37ba0ead..89b9a07567 100644 --- a/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled-composite/arm32v7/Dockerfile @@ -4,29 +4,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-arm32v7 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-arm32v7 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile index f5dc071d5f..ccbc8d687c 100644 --- a/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled-composite/arm64v8/Dockerfile @@ -4,29 +4,30 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm64v8/buildpack-deps:resolute-curl AS installer # Retrieve ASP.NET Composite Runtime -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # ASP.NET Composite Image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-arm64v8 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-arm64v8 ENV \ # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 \ + DOTNET_VERSION=11.0.0-preview.2.final \ # ASP.NET Core version - ASPNET_VERSION=11.0.0-preview.1.26104.118 + ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile index 74b32a035e..b7f684d363 100644 --- a/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled-extra/amd64/Dockerfile @@ -4,22 +4,23 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM amd64/buildpack-deps:resolute-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-extra-amd64 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-extra-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile index b0ff8cfe0d..6f02f061ed 100644 --- a/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled-extra/arm32v7/Dockerfile @@ -4,22 +4,23 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-extra-arm32v7 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-extra-arm32v7 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile index 797102dbf1..2afa00f81f 100644 --- a/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled-extra/arm64v8/Dockerfile @@ -4,22 +4,23 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm64v8/buildpack-deps:resolute-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-extra-arm64v8 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-extra-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile b/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile index 8e82894f58..586f846f2f 100644 --- a/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled/amd64/Dockerfile @@ -4,22 +4,23 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM amd64/buildpack-deps:resolute-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-amd64 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile index 2411a512f5..69e9aa6930 100644 --- a/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled/arm32v7/Dockerfile @@ -4,22 +4,23 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-arm32v7 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-arm32v7 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile index 2cbd3bfa6a..13e4c880fc 100644 --- a/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile +++ b/src/aspnet/11.0/resolute-chiseled/arm64v8/Dockerfile @@ -4,22 +4,23 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm64v8/buildpack-deps:resolute-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-arm64v8 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/resolute/amd64/Dockerfile b/src/aspnet/11.0/resolute/amd64/Dockerfile index 9b7c924e0f..3f80099a03 100644 --- a/src/aspnet/11.0/resolute/amd64/Dockerfile +++ b/src/aspnet/11.0/resolute/amd64/Dockerfile @@ -4,22 +4,23 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM amd64/buildpack-deps:resolute-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-resolute-amd64 +FROM $REPO:11.0.0-preview.2-resolute-amd64 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/resolute/arm32v7/Dockerfile b/src/aspnet/11.0/resolute/arm32v7/Dockerfile index 4cd4d56296..156ac73434 100644 --- a/src/aspnet/11.0/resolute/arm32v7/Dockerfile +++ b/src/aspnet/11.0/resolute/arm32v7/Dockerfile @@ -4,22 +4,23 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-resolute-arm32v7 +FROM $REPO:11.0.0-preview.2-resolute-arm32v7 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/resolute/arm64v8/Dockerfile b/src/aspnet/11.0/resolute/arm64v8/Dockerfile index 872dd30ff3..d7dc80f0ff 100644 --- a/src/aspnet/11.0/resolute/arm64v8/Dockerfile +++ b/src/aspnet/11.0/resolute/arm64v8/Dockerfile @@ -4,22 +4,23 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime FROM arm64v8/buildpack-deps:resolute-curl AS installer # Retrieve ASP.NET Core -RUN aspnetcore_version=11.0.0-preview.1.26104.118 \ +RUN aspnetcore_version=11.0.0-preview.2.26155.102 \ + && aspnetcore_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-resolute-arm64v8 +FROM $REPO:11.0.0-preview.2-resolute-arm64v8 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile index e941b00ac2..4276eb43a9 100644 --- a/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile +++ b/src/aspnet/11.0/windowsservercore-ltsc2025/amd64/Dockerfile @@ -10,12 +10,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $aspnetcore_version = '11.0.0-preview.1.26104.118'; ` - $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $aspnetcore_file + '.sha512-bare'; ` + $aspnetcore_version = '11.0.0-preview.2.26155.102'; ` + $aspnetcore_file_version = '11.0.0-preview.2.final'; ` + $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_file_version + '-win-x64.zip'; ` + $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $aspnetcore_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $aspnetcore_file https://ci.dot.net/public/aspnetcore/Runtime/$aspnetcore_version/$aspnetcore_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/aspnetcore/Runtime/$aspnetcore_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $aspnetcore_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -30,9 +31,9 @@ RUN powershell -Command ` # ASP.NET Core image -FROM $REPO:11.0.0-preview.1-windowsservercore-ltsc2025 +FROM $REPO:11.0.0-preview.2-windowsservercore-ltsc2025 # ASP.NET Core version -ENV ASPNET_VERSION=11.0.0-preview.1.26104.118 +ENV ASPNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet/shared/Microsoft.AspNetCore.App", "/Program Files/dotnet/shared/Microsoft.AspNetCore.App"] diff --git a/src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile index ecd88fc7b9..dc3fcfbddd 100644 --- a/src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled-extra/amd64/Dockerfile @@ -2,8 +2,8 @@ FROM amd64/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_amd64.tar.gz \ + && chisel_sha384='e6d3210880eab61524dd83768278afffeb42ec49820b4263a2c5d9f5898c07ee3cbcb4699bae7878370c965b32527820' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile index d976820ebf..5262c18285 100644 --- a/src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled-extra/arm32v7/Dockerfile @@ -2,8 +2,8 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm.tar.gz \ + && chisel_sha384='5edcb99020507325747b00314b85b6cf321238b99ebd5f3e6fe9f2315723c54f1b18fe066f5f9d55fe79bf1862d70997' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile index 4f29219fe8..8cc5fb8aa9 100644 --- a/src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -2,8 +2,8 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm64.tar.gz \ + && chisel_sha384='bc2caf1fac6463982ff0770ae5e7aa51f37307d281c1ca56d3ef9068c30434b254dc72739f7d2689a2e7975923eff1ff' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile b/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile index 87acfe8b95..f90b04e781 100644 --- a/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled/amd64/Dockerfile @@ -2,8 +2,8 @@ FROM amd64/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_amd64.tar.gz \ + && chisel_sha384='e6d3210880eab61524dd83768278afffeb42ec49820b4263a2c5d9f5898c07ee3cbcb4699bae7878370c965b32527820' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile index 2be7ef5c00..44d7ba3d19 100644 --- a/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled/arm32v7/Dockerfile @@ -2,8 +2,8 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm.tar.gz \ + && chisel_sha384='5edcb99020507325747b00314b85b6cf321238b99ebd5f3e6fe9f2315723c54f1b18fe066f5f9d55fe79bf1862d70997' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile index 89c07ffc2a..1fc9cd3bbd 100644 --- a/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/10.0/noble-chiseled/arm64v8/Dockerfile @@ -2,8 +2,8 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm64.tar.gz \ + && chisel_sha384='bc2caf1fac6463982ff0770ae5e7aa51f37307d281c1ca56d3ef9068c30434b254dc72739f7d2689a2e7975923eff1ff' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile index b17a1d4d25..ed94b857c2 100644 --- a/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled-extra/amd64/Dockerfile @@ -2,8 +2,8 @@ FROM amd64/buildpack-deps:resolute-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_amd64.tar.gz \ + && chisel_sha384='e6d3210880eab61524dd83768278afffeb42ec49820b4263a2c5d9f5898c07ee3cbcb4699bae7878370c965b32527820' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ @@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \ ca-certificates_data \ libc6_libs \ libgcc-s1_libs \ - libicu76_libs \ + libicu78_libs \ libssl3t64_libs \ libstdc++6_libs \ tzdata-legacy_zoneinfo \ diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile index 0feaa21282..6d479cd06e 100644 --- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm32v7/Dockerfile @@ -2,8 +2,8 @@ FROM arm32v7/buildpack-deps:resolute-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm.tar.gz \ + && chisel_sha384='5edcb99020507325747b00314b85b6cf321238b99ebd5f3e6fe9f2315723c54f1b18fe066f5f9d55fe79bf1862d70997' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ @@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \ ca-certificates_data \ libc6_libs \ libgcc-s1_libs \ - libicu76_libs \ + libicu78_libs \ libssl3t64_libs \ libstdc++6_libs \ tzdata-legacy_zoneinfo \ diff --git a/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile index 8ee322b566..f4fadfae97 100644 --- a/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled-extra/arm64v8/Dockerfile @@ -2,8 +2,8 @@ FROM arm64v8/buildpack-deps:resolute-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm64.tar.gz \ + && chisel_sha384='bc2caf1fac6463982ff0770ae5e7aa51f37307d281c1ca56d3ef9068c30434b254dc72739f7d2689a2e7975923eff1ff' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ @@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \ ca-certificates_data \ libc6_libs \ libgcc-s1_libs \ - libicu76_libs \ + libicu78_libs \ libssl3t64_libs \ libstdc++6_libs \ tzdata-legacy_zoneinfo \ diff --git a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile index 7a8ed94923..28afbaad16 100644 --- a/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled/amd64/Dockerfile @@ -2,8 +2,8 @@ FROM amd64/buildpack-deps:resolute-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_amd64.tar.gz \ + && chisel_sha384='e6d3210880eab61524dd83768278afffeb42ec49820b4263a2c5d9f5898c07ee3cbcb4699bae7878370c965b32527820' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile index fe1a5034ad..52af504cac 100644 --- a/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled/arm32v7/Dockerfile @@ -2,8 +2,8 @@ FROM arm32v7/buildpack-deps:resolute-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm.tar.gz \ + && chisel_sha384='5edcb99020507325747b00314b85b6cf321238b99ebd5f3e6fe9f2315723c54f1b18fe066f5f9d55fe79bf1862d70997' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile index dc37fc9eda..056a58c8af 100644 --- a/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/resolute-chiseled/arm64v8/Dockerfile @@ -2,8 +2,8 @@ FROM arm64v8/buildpack-deps:resolute-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm64.tar.gz \ + && chisel_sha384='bc2caf1fac6463982ff0770ae5e7aa51f37307d281c1ca56d3ef9068c30434b254dc72739f7d2689a2e7975923eff1ff' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/11.0/resolute/amd64/Dockerfile b/src/runtime-deps/11.0/resolute/amd64/Dockerfile index 79b4af5af5..453e0c2bab 100644 --- a/src/runtime-deps/11.0/resolute/amd64/Dockerfile +++ b/src/runtime-deps/11.0/resolute/amd64/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update \ # .NET dependencies libc6 \ libgcc-s1 \ - libicu76 \ + libicu78 \ libssl3t64 \ libstdc++6 \ tzdata \ diff --git a/src/runtime-deps/11.0/resolute/arm32v7/Dockerfile b/src/runtime-deps/11.0/resolute/arm32v7/Dockerfile index 79b4af5af5..453e0c2bab 100644 --- a/src/runtime-deps/11.0/resolute/arm32v7/Dockerfile +++ b/src/runtime-deps/11.0/resolute/arm32v7/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update \ # .NET dependencies libc6 \ libgcc-s1 \ - libicu76 \ + libicu78 \ libssl3t64 \ libstdc++6 \ tzdata \ diff --git a/src/runtime-deps/11.0/resolute/arm64v8/Dockerfile b/src/runtime-deps/11.0/resolute/arm64v8/Dockerfile index 79b4af5af5..453e0c2bab 100644 --- a/src/runtime-deps/11.0/resolute/arm64v8/Dockerfile +++ b/src/runtime-deps/11.0/resolute/arm64v8/Dockerfile @@ -15,7 +15,7 @@ RUN apt-get update \ # .NET dependencies libc6 \ libgcc-s1 \ - libicu76 \ + libicu78 \ libssl3t64 \ libstdc++6 \ tzdata \ diff --git a/src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile index 89ab3cfdee..41b5d0dd78 100644 --- a/src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled-extra/amd64/Dockerfile @@ -2,8 +2,8 @@ FROM amd64/buildpack-deps:jammy-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_amd64.tar.gz \ + && chisel_sha384='e6d3210880eab61524dd83768278afffeb42ec49820b4263a2c5d9f5898c07ee3cbcb4699bae7878370c965b32527820' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile index 4d92f68d55..c40ae936b7 100644 --- a/src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled-extra/arm32v7/Dockerfile @@ -2,8 +2,8 @@ FROM arm32v7/buildpack-deps:jammy-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm.tar.gz \ + && chisel_sha384='5edcb99020507325747b00314b85b6cf321238b99ebd5f3e6fe9f2315723c54f1b18fe066f5f9d55fe79bf1862d70997' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile index 90d5f25667..28000e1292 100644 --- a/src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled-extra/arm64v8/Dockerfile @@ -2,8 +2,8 @@ FROM arm64v8/buildpack-deps:jammy-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm64.tar.gz \ + && chisel_sha384='bc2caf1fac6463982ff0770ae5e7aa51f37307d281c1ca56d3ef9068c30434b254dc72739f7d2689a2e7975923eff1ff' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile index 776dc1716c..596bfef5ac 100644 --- a/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled/amd64/Dockerfile @@ -2,8 +2,8 @@ FROM amd64/buildpack-deps:jammy-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_amd64.tar.gz \ + && chisel_sha384='e6d3210880eab61524dd83768278afffeb42ec49820b4263a2c5d9f5898c07ee3cbcb4699bae7878370c965b32527820' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile index c53fae522f..6b35b91350 100644 --- a/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled/arm32v7/Dockerfile @@ -2,8 +2,8 @@ FROM arm32v7/buildpack-deps:jammy-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm.tar.gz \ + && chisel_sha384='5edcb99020507325747b00314b85b6cf321238b99ebd5f3e6fe9f2315723c54f1b18fe066f5f9d55fe79bf1862d70997' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile b/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile index 2ee96e6036..8695b8ad56 100644 --- a/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/jammy-chiseled/arm64v8/Dockerfile @@ -2,8 +2,8 @@ FROM arm64v8/buildpack-deps:jammy-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm64.tar.gz \ + && chisel_sha384='bc2caf1fac6463982ff0770ae5e7aa51f37307d281c1ca56d3ef9068c30434b254dc72739f7d2689a2e7975923eff1ff' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile index a28669965e..ab75350aff 100644 --- a/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled-extra/amd64/Dockerfile @@ -2,8 +2,8 @@ FROM amd64/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_amd64.tar.gz \ + && chisel_sha384='e6d3210880eab61524dd83768278afffeb42ec49820b4263a2c5d9f5898c07ee3cbcb4699bae7878370c965b32527820' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile index 4a649d715e..65100c6972 100644 --- a/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -2,8 +2,8 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm64.tar.gz \ + && chisel_sha384='bc2caf1fac6463982ff0770ae5e7aa51f37307d281c1ca56d3ef9068c30434b254dc72739f7d2689a2e7975923eff1ff' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile b/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile index fc83967ae2..9231d2cb40 100644 --- a/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled/amd64/Dockerfile @@ -2,8 +2,8 @@ FROM amd64/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_amd64.tar.gz \ + && chisel_sha384='e6d3210880eab61524dd83768278afffeb42ec49820b4263a2c5d9f5898c07ee3cbcb4699bae7878370c965b32527820' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile index 0899e2dbc0..ec57c4a390 100644 --- a/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/8.0/noble-chiseled/arm64v8/Dockerfile @@ -2,8 +2,8 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm64.tar.gz \ + && chisel_sha384='bc2caf1fac6463982ff0770ae5e7aa51f37307d281c1ca56d3ef9068c30434b254dc72739f7d2689a2e7975923eff1ff' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile b/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile index c2eba0f2e5..32b8cb1d0a 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/amd64/Dockerfile @@ -2,8 +2,8 @@ FROM amd64/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_amd64.tar.gz \ + && chisel_sha384='e6d3210880eab61524dd83768278afffeb42ec49820b4263a2c5d9f5898c07ee3cbcb4699bae7878370c965b32527820' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile b/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile index 7b3e2f7cb7..baaada2774 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/arm32v7/Dockerfile @@ -2,8 +2,8 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm.tar.gz \ + && chisel_sha384='5edcb99020507325747b00314b85b6cf321238b99ebd5f3e6fe9f2315723c54f1b18fe066f5f9d55fe79bf1862d70997' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile b/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile index bd8f972aae..7795689056 100644 --- a/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled-extra/arm64v8/Dockerfile @@ -2,8 +2,8 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm64.tar.gz \ + && chisel_sha384='bc2caf1fac6463982ff0770ae5e7aa51f37307d281c1ca56d3ef9068c30434b254dc72739f7d2689a2e7975923eff1ff' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile b/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile index 5ea4b670ea..7b8e8fa174 100644 --- a/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled/amd64/Dockerfile @@ -2,8 +2,8 @@ FROM amd64/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_amd64.tar.gz \ - && chisel_sha384='8a5a6831251828fcd9ce8c9a47fca941d8763b7c80c16da784e2b1bf830ba606ab848f3886ce5945a3c2fc5e719c77e9' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_amd64.tar.gz \ + && chisel_sha384='e6d3210880eab61524dd83768278afffeb42ec49820b4263a2c5d9f5898c07ee3cbcb4699bae7878370c965b32527820' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile b/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile index 9ed51b529c..ff70121fe8 100644 --- a/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled/arm32v7/Dockerfile @@ -2,8 +2,8 @@ FROM arm32v7/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm.tar.gz \ - && chisel_sha384='fbfabeea4adabd7c3f7fc5b9bd09636200d68091ad3fa4cf901fd5567285b60fb0c8a4bc54e558bac3921ecf9679e7fb' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm.tar.gz \ + && chisel_sha384='5edcb99020507325747b00314b85b6cf321238b99ebd5f3e6fe9f2315723c54f1b18fe066f5f9d55fe79bf1862d70997' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile b/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile index 70b9f3f4e3..6c98e890a0 100644 --- a/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile +++ b/src/runtime-deps/9.0/noble-chiseled/arm64v8/Dockerfile @@ -2,8 +2,8 @@ FROM arm64v8/buildpack-deps:noble-curl AS chisel RUN apt-get update && apt-get install -y file -RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.3.0/chisel_v1.3.0_linux_arm64.tar.gz \ - && chisel_sha384='5e5ae3083ecb59c314fbee290263ccc7417016798943fb533f01737918d38c35d21d683c5fe89e6fd3488af90ec7c83b' \ +RUN curl --fail --show-error --location --output chisel.tar.gz https://github.com/canonical/chisel/releases/download/v1.4.0/chisel_v1.4.0_linux_arm64.tar.gz \ + && chisel_sha384='bc2caf1fac6463982ff0770ae5e7aa51f37307d281c1ca56d3ef9068c30434b254dc72739f7d2689a2e7975923eff1ff' \ && echo "$chisel_sha384 chisel.tar.gz" | sha384sum -c - \ && tar --gzip --extract --no-same-owner --file chisel.tar.gz --directory /usr/bin/ \ && rm chisel.tar.gz \ diff --git a/src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile b/src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile index d864b8c74a..a420ce330f 100644 --- a/src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile +++ b/src/runtime/11.0/alpine3.23-extra/amd64/Dockerfile @@ -1,26 +1,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-amd64 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-amd64 AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \ + https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz \ + https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 # .NET runtime image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-amd64 +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-amd64 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile index 4f548c7e71..e77bef59d5 100644 --- a/src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile +++ b/src/runtime/11.0/alpine3.23-extra/arm32v7/Dockerfile @@ -1,26 +1,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm32v7 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm32v7 AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \ + https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz \ + https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 # .NET runtime image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm32v7 +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm32v7 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile index b46bffe35a..89f557f183 100644 --- a/src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile +++ b/src/runtime/11.0/alpine3.23-extra/arm64v8/Dockerfile @@ -1,26 +1,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm64v8 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm64v8 AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \ + https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz \ + https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 # .NET runtime image -FROM $REPO:11.0.0-preview.1-alpine3.23-extra-arm64v8 +FROM $REPO:11.0.0-preview.2-alpine3.23-extra-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/11.0/alpine3.23/amd64/Dockerfile b/src/runtime/11.0/alpine3.23/amd64/Dockerfile index 56882a54a3..f584b36075 100644 --- a/src/runtime/11.0/alpine3.23/amd64/Dockerfile +++ b/src/runtime/11.0/alpine3.23/amd64/Dockerfile @@ -1,26 +1,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-amd64 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-amd64 AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \ + https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz \ + https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 # .NET runtime image -FROM $REPO:11.0.0-preview.1-alpine3.23-amd64 +FROM $REPO:11.0.0-preview.2-alpine3.23-amd64 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile b/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile index 34b9f6031c..d7c8793518 100644 --- a/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile +++ b/src/runtime/11.0/alpine3.23/arm32v7/Dockerfile @@ -1,26 +1,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm32v7 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-arm32v7 AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \ + https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz \ + https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 # .NET runtime image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm32v7 +FROM $REPO:11.0.0-preview.2-alpine3.23-arm32v7 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile b/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile index 1ab9ca524c..fc5e54e4c4 100644 --- a/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile +++ b/src/runtime/11.0/alpine3.23/arm64v8/Dockerfile @@ -1,26 +1,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm64v8 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-arm64v8 AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \ + https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz \ + https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 # .NET runtime image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm64v8 +FROM $REPO:11.0.0-preview.2-alpine3.23-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile index 072d02a9c2..24e574af7f 100644 --- a/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile +++ b/src/runtime/11.0/azurelinux3.0-distroless-extra/amd64/Dockerfile @@ -10,26 +10,27 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # .NET runtime image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-extra-amd64 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-extra-amd64 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile index e7e0c15238..5b6904df7a 100644 --- a/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile +++ b/src/runtime/11.0/azurelinux3.0-distroless-extra/arm64v8/Dockerfile @@ -10,26 +10,27 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # .NET runtime image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-extra-arm64v8 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-extra-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile index 315471d4b0..8e56c5278e 100644 --- a/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile +++ b/src/runtime/11.0/azurelinux3.0-distroless/amd64/Dockerfile @@ -10,26 +10,27 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # .NET runtime image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-amd64 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-amd64 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile index d3fc33d9ce..5127988ce3 100644 --- a/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile +++ b/src/runtime/11.0/azurelinux3.0-distroless/arm64v8/Dockerfile @@ -10,26 +10,27 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # .NET runtime image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-distroless-arm64v8 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-distroless-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile b/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile index 8d188a9ca7..6920663f24 100644 --- a/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile +++ b/src/runtime/11.0/azurelinux3.0/amd64/Dockerfile @@ -1,30 +1,31 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-amd64 AS installer +FROM $REPO:11.0.0-preview.2-azurelinux3.0-amd64 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 # .NET runtime image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-amd64 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-amd64 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile index dc31345f3e..9d4844ee55 100644 --- a/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile +++ b/src/runtime/11.0/azurelinux3.0/arm64v8/Dockerfile @@ -1,30 +1,31 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps # Installer image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-arm64v8 AS installer +FROM $REPO:11.0.0-preview.2-azurelinux3.0-arm64v8 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 # .NET runtime image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-arm64v8 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile index ba243feb21..f4e427403b 100644 --- a/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile +++ b/src/runtime/11.0/nanoserver-ltsc2025/amd64/Dockerfile @@ -8,12 +8,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $dotnet_version = '11.0.0-preview.1.26104.118'; ` - $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_version = '11.0.0-preview.2.26155.102'; ` + $dotnet_file_version = '11.0.0-preview.2.final'; ` + $dotnet_file = 'dotnet-runtime-' + $dotnet_file_version + '-win-x64.zip'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -36,7 +37,7 @@ ENV ` # Enable detection of running in a container DOTNET_RUNNING_IN_CONTAINER=true ` # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 + DOTNET_VERSION=11.0.0-preview.2.final # In order to set system PATH, ContainerAdministrator must be used USER ContainerAdministrator diff --git a/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile index 1aa63650ef..e98a1c2e00 100644 --- a/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile +++ b/src/runtime/11.0/resolute-chiseled-extra/amd64/Dockerfile @@ -4,26 +4,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM amd64/buildpack-deps:resolute-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # .NET runtime image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-extra-amd64 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-extra-amd64 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile index e8ae152e3d..40984ff1a4 100644 --- a/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile +++ b/src/runtime/11.0/resolute-chiseled-extra/arm32v7/Dockerfile @@ -4,26 +4,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # .NET runtime image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-extra-arm32v7 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-extra-arm32v7 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile index 3f69fbaa79..9674d83706 100644 --- a/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile +++ b/src/runtime/11.0/resolute-chiseled-extra/arm64v8/Dockerfile @@ -4,26 +4,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm64v8/buildpack-deps:resolute-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # .NET runtime image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-extra-arm64v8 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-extra-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile b/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile index 5c060fe1e2..b0c798cfb8 100644 --- a/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile +++ b/src/runtime/11.0/resolute-chiseled/amd64/Dockerfile @@ -4,26 +4,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM amd64/buildpack-deps:resolute-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # .NET runtime image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-amd64 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-amd64 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile index 32b60df47d..2ce8a8f5cb 100644 --- a/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile +++ b/src/runtime/11.0/resolute-chiseled/arm32v7/Dockerfile @@ -4,26 +4,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # .NET runtime image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-arm32v7 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-arm32v7 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile b/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile index 9e095058ce..2502b0861d 100644 --- a/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile +++ b/src/runtime/11.0/resolute-chiseled/arm64v8/Dockerfile @@ -4,26 +4,27 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm64v8/buildpack-deps:resolute-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet # .NET runtime image -FROM $REPO:11.0.0-preview.1-resolute-chiseled-arm64v8 +FROM $REPO:11.0.0-preview.2-resolute-chiseled-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/usr/share/dotnet", "/usr/share/dotnet"] COPY --from=installer ["/dotnet-symlink", "/usr/bin"] diff --git a/src/runtime/11.0/resolute/amd64/Dockerfile b/src/runtime/11.0/resolute/amd64/Dockerfile index 7507fd4f07..523386298c 100644 --- a/src/runtime/11.0/resolute/amd64/Dockerfile +++ b/src/runtime/11.0/resolute/amd64/Dockerfile @@ -4,23 +4,24 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM amd64/buildpack-deps:resolute-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 # .NET runtime image -FROM $REPO:11.0.0-preview.1-resolute-amd64 +FROM $REPO:11.0.0-preview.2-resolute-amd64 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/11.0/resolute/arm32v7/Dockerfile b/src/runtime/11.0/resolute/arm32v7/Dockerfile index 52d1959bf1..7bfda70a32 100644 --- a/src/runtime/11.0/resolute/arm32v7/Dockerfile +++ b/src/runtime/11.0/resolute/arm32v7/Dockerfile @@ -4,23 +4,24 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm32v7/buildpack-deps:jammy-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 # .NET runtime image -FROM $REPO:11.0.0-preview.1-resolute-arm32v7 +FROM $REPO:11.0.0-preview.2-resolute-arm32v7 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/11.0/resolute/arm64v8/Dockerfile b/src/runtime/11.0/resolute/arm64v8/Dockerfile index 4a26ebdaed..7140539a12 100644 --- a/src/runtime/11.0/resolute/arm64v8/Dockerfile +++ b/src/runtime/11.0/resolute/arm64v8/Dockerfile @@ -4,23 +4,24 @@ ARG REPO=mcr.microsoft.com/dotnet/runtime-deps FROM arm64v8/buildpack-deps:resolute-curl AS installer # Retrieve .NET Runtime -RUN dotnet_version=11.0.0-preview.1.26104.118 \ +RUN dotnet_version=11.0.0-preview.2.26155.102 \ + && dotnet_file_version=11.0.0-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 # .NET runtime image -FROM $REPO:11.0.0-preview.1-resolute-arm64v8 +FROM $REPO:11.0.0-preview.2-resolute-arm64v8 # .NET Runtime version -ENV DOTNET_VERSION=11.0.0-preview.1.26104.118 +ENV DOTNET_VERSION=11.0.0-preview.2.final COPY --from=installer ["/dotnet", "/usr/share/dotnet"] diff --git a/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile index 16de77f094..3757970edf 100644 --- a/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile +++ b/src/runtime/11.0/windowsservercore-ltsc2025/amd64/Dockerfile @@ -8,12 +8,13 @@ RUN powershell -Command ` $ErrorActionPreference = 'Stop'; ` $ProgressPreference = 'SilentlyContinue'; ` ` - $dotnet_version = '11.0.0-preview.1.26104.118'; ` - $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_version = '11.0.0-preview.2.26155.102'; ` + $dotnet_file_version = '11.0.0-preview.2.final'; ` + $dotnet_file = 'dotnet-runtime-' + $dotnet_file_version + '-win-x64.zip'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Runtime/$dotnet_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Runtime/$dotnet_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Runtime/$dotnet_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -36,7 +37,7 @@ ENV ` # Enable detection of running in a container DOTNET_RUNNING_IN_CONTAINER=true ` # .NET Runtime version - DOTNET_VERSION=11.0.0-preview.1.26104.118 + DOTNET_VERSION=11.0.0-preview.2.final RUN setx /M PATH "%PATH%;C:\Program Files\dotnet" diff --git a/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile b/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile index 944fd94369..240e824f50 100644 --- a/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile +++ b/src/sdk/11.0/alpine3.23-aot/amd64/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:11.0.100-preview.1-alpine3.23-amd64 +FROM $REPO:11.0.100-preview.2-alpine3.23-amd64 RUN apk add --upgrade --no-cache \ build-base \ diff --git a/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile index 022526a3c2..ffc4b1bdf3 100644 --- a/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile +++ b/src/sdk/11.0/alpine3.23-aot/arm64v8/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:11.0.100-preview.1-alpine3.23-arm64v8 +FROM $REPO:11.0.100-preview.2-alpine3.23-arm64v8 RUN apk add --upgrade --no-cache \ build-base \ diff --git a/src/sdk/11.0/alpine3.23/amd64/Dockerfile b/src/sdk/11.0/alpine3.23/amd64/Dockerfile index a0a91501b4..268fe937e5 100644 --- a/src/sdk/11.0/alpine3.23/amd64/Dockerfile +++ b/src/sdk/11.0/alpine3.23/amd64/Dockerfile @@ -1,22 +1,23 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-amd64 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-amd64 AS installer # Install .NET SDK -RUN dotnet_sdk_version=11.0.100-preview.1.26104.118 \ +RUN dotnet_sdk_version=11.0.100-preview.2.26155.102 \ + && dotnet_sdk_file_version=11.0.100-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \ + https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz \ + https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz.sha512 # .NET SDK image -FROM $REPO:11.0.0-preview.1-alpine3.23-amd64 +FROM $REPO:11.0.0-preview.2-alpine3.23-amd64 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=11.0.100-preview.1.26104.118 \ + DOTNET_SDK_VERSION=11.0.100-preview.2.final \ # Disable the invariant mode (set in base image) DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile b/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile index be71d578bd..53ce2d722d 100644 --- a/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile +++ b/src/sdk/11.0/alpine3.23/arm32v7/Dockerfile @@ -1,22 +1,23 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm32v7 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-arm32v7 AS installer # Install .NET SDK -RUN dotnet_sdk_version=11.0.100-preview.1.26104.118 \ +RUN dotnet_sdk_version=11.0.100-preview.2.26155.102 \ + && dotnet_sdk_file_version=11.0.100-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \ + https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz \ + https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz.sha512 # .NET SDK image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm32v7 +FROM $REPO:11.0.0-preview.2-alpine3.23-arm32v7 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=11.0.100-preview.1.26104.118 \ + DOTNET_SDK_VERSION=11.0.100-preview.2.final \ # Disable the invariant mode (set in base image) DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile b/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile index 24d3cd8f1f..99c6e44086 100644 --- a/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile +++ b/src/sdk/11.0/alpine3.23/arm64v8/Dockerfile @@ -1,22 +1,23 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm64v8 AS installer +FROM $REPO:11.0.0-preview.2-alpine3.23-arm64v8 AS installer # Install .NET SDK -RUN dotnet_sdk_version=11.0.100-preview.1.26104.118 \ +RUN dotnet_sdk_version=11.0.100-preview.2.26155.102 \ + && dotnet_sdk_file_version=11.0.100-preview.2.final \ && wget \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \ - https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \ + https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz \ + https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz.sha512 # .NET SDK image -FROM $REPO:11.0.0-preview.1-alpine3.23-arm64v8 +FROM $REPO:11.0.0-preview.2-alpine3.23-arm64v8 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=11.0.100-preview.1.26104.118 \ + DOTNET_SDK_VERSION=11.0.100-preview.2.final \ # Disable the invariant mode (set in base image) DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=false \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile b/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile index daa777a711..7888a4d5a6 100644 --- a/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile +++ b/src/sdk/11.0/azurelinux3.0-aot/amd64/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:11.0.100-preview.1-azurelinux3.0-amd64 +FROM $REPO:11.0.100-preview.2-azurelinux3.0-amd64 RUN tdnf install -y \ build-essential \ diff --git a/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile b/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile index 6c42369005..4ea5b07ff7 100644 --- a/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile +++ b/src/sdk/11.0/azurelinux3.0-aot/arm64v8/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:11.0.100-preview.1-azurelinux3.0-arm64v8 +FROM $REPO:11.0.100-preview.2-azurelinux3.0-arm64v8 RUN tdnf install -y \ build-essential \ diff --git a/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile index 1079b154fe..bc80ee7035 100644 --- a/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile +++ b/src/sdk/11.0/azurelinux3.0/amd64/Dockerfile @@ -1,26 +1,27 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-amd64 AS installer +FROM $REPO:11.0.0-preview.2-azurelinux3.0-amd64 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Install .NET SDK -RUN dotnet_sdk_version=11.0.100-preview.1.26104.118 \ +RUN dotnet_sdk_version=11.0.100-preview.2.26155.102 \ + && dotnet_sdk_file_version=11.0.100-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 # .NET SDK image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-amd64 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-amd64 ENV \ # Do not generate certificate @@ -28,7 +29,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=11.0.100-preview.1.26104.118 \ + DOTNET_SDK_VERSION=11.0.100-preview.2.final \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile index 55ebefc7fb..50bddf338c 100644 --- a/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile +++ b/src/sdk/11.0/azurelinux3.0/arm64v8/Dockerfile @@ -1,26 +1,27 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet # Installer image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-arm64v8 AS installer +FROM $REPO:11.0.0-preview.2-azurelinux3.0-arm64v8 AS installer RUN tdnf install -y \ tar \ && tdnf clean all # Install .NET SDK -RUN dotnet_sdk_version=11.0.100-preview.1.26104.118 \ +RUN dotnet_sdk_version=11.0.100-preview.2.26155.102 \ + && dotnet_sdk_file_version=11.0.100-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 # .NET SDK image -FROM $REPO:11.0.0-preview.1-azurelinux3.0-arm64v8 +FROM $REPO:11.0.0-preview.2-azurelinux3.0-arm64v8 ENV \ # Do not generate certificate @@ -28,7 +29,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=11.0.100-preview.1.26104.118 \ + DOTNET_SDK_VERSION=11.0.100-preview.2.final \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile index 7b366459e7..8086e361b4 100644 --- a/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile +++ b/src/sdk/11.0/nanoserver-ltsc2025/amd64/Dockerfile @@ -25,12 +25,13 @@ RUN powershell -Command " ` $ProgressPreference = 'SilentlyContinue'; ` ` # Retrieve .NET SDK - $dotnet_sdk_version = '11.0.100-preview.1.26104.118'; ` - $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_sdk_version = '11.0.100-preview.2.26155.102'; ` + $dotnet_sdk_file_version = '11.0.100-preview.2.final'; ` + $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_file_version + '-win-x64.zip'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -64,7 +65,7 @@ RUN powershell -Command " ` # SDK image -FROM $REPO:11.0.0-preview.1-nanoserver-ltsc2025 +FROM $REPO:11.0.0-preview.2-nanoserver-ltsc2025 ENV ` # Do not generate certificate @@ -72,7 +73,7 @@ ENV ` # Do not show first run text DOTNET_NOLOGO=true ` # SDK version - DOTNET_SDK_VERSION=11.0.100-preview.1.26104.118 ` + DOTNET_SDK_VERSION=11.0.100-preview.2.final ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/11.0/resolute-aot/amd64/Dockerfile b/src/sdk/11.0/resolute-aot/amd64/Dockerfile index 7b201962e6..cce91f4196 100644 --- a/src/sdk/11.0/resolute-aot/amd64/Dockerfile +++ b/src/sdk/11.0/resolute-aot/amd64/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:11.0.100-preview.1-resolute-amd64 +FROM $REPO:11.0.100-preview.2-resolute-amd64 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/11.0/resolute-aot/arm64v8/Dockerfile b/src/sdk/11.0/resolute-aot/arm64v8/Dockerfile index da205ba46c..6b148fa1c2 100644 --- a/src/sdk/11.0/resolute-aot/arm64v8/Dockerfile +++ b/src/sdk/11.0/resolute-aot/arm64v8/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 ARG REPO=mcr.microsoft.com/dotnet/sdk -FROM $REPO:11.0.100-preview.1-resolute-arm64v8 +FROM $REPO:11.0.100-preview.2-resolute-arm64v8 RUN apt-get update \ && apt-get install -y --no-install-recommends \ diff --git a/src/sdk/11.0/resolute/amd64/Dockerfile b/src/sdk/11.0/resolute/amd64/Dockerfile index 3713b1c063..b6fdff2513 100644 --- a/src/sdk/11.0/resolute/amd64/Dockerfile +++ b/src/sdk/11.0/resolute/amd64/Dockerfile @@ -3,20 +3,21 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet FROM amd64/buildpack-deps:resolute-curl AS installer # Install .NET SDK -RUN dotnet_sdk_version=11.0.100-preview.1.26104.118 \ +RUN dotnet_sdk_version=11.0.100-preview.2.26155.102 \ + && dotnet_sdk_file_version=11.0.100-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 # .NET SDK image -FROM $REPO:11.0.0-preview.1-resolute-amd64 +FROM $REPO:11.0.0-preview.2-resolute-amd64 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=11.0.100-preview.1.26104.118 \ + DOTNET_SDK_VERSION=11.0.100-preview.2.final \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/11.0/resolute/arm32v7/Dockerfile b/src/sdk/11.0/resolute/arm32v7/Dockerfile index 8770a902ab..fca8f529f0 100644 --- a/src/sdk/11.0/resolute/arm32v7/Dockerfile +++ b/src/sdk/11.0/resolute/arm32v7/Dockerfile @@ -3,20 +3,21 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet FROM arm32v7/buildpack-deps:jammy-curl AS installer # Install .NET SDK -RUN dotnet_sdk_version=11.0.100-preview.1.26104.118 \ +RUN dotnet_sdk_version=11.0.100-preview.2.26155.102 \ + && dotnet_sdk_file_version=11.0.100-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz.sha512 # .NET SDK image -FROM $REPO:11.0.0-preview.1-resolute-arm32v7 +FROM $REPO:11.0.0-preview.2-resolute-arm32v7 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=11.0.100-preview.1.26104.118 \ + DOTNET_SDK_VERSION=11.0.100-preview.2.final \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/11.0/resolute/arm64v8/Dockerfile b/src/sdk/11.0/resolute/arm64v8/Dockerfile index d268026440..adfabdd5f7 100644 --- a/src/sdk/11.0/resolute/arm64v8/Dockerfile +++ b/src/sdk/11.0/resolute/arm64v8/Dockerfile @@ -3,20 +3,21 @@ ARG REPO=mcr.microsoft.com/dotnet/aspnet FROM arm64v8/buildpack-deps:resolute-curl AS installer # Install .NET SDK -RUN dotnet_sdk_version=11.0.100-preview.1.26104.118 \ +RUN dotnet_sdk_version=11.0.100-preview.2.26155.102 \ + && dotnet_sdk_file_version=11.0.100-preview.2.final \ && curl --fail --show-error --location \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - --remote-name https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ - && sha512sum -c dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ + --remote-name https://ci.dot.net/public/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz \ + --remote-name https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 # .NET SDK image -FROM $REPO:11.0.0-preview.1-resolute-arm64v8 +FROM $REPO:11.0.0-preview.2-resolute-arm64v8 ENV \ # Do not generate certificate @@ -24,7 +25,7 @@ ENV \ # Do not show first run text DOTNET_NOLOGO=true \ # SDK version - DOTNET_SDK_VERSION=11.0.100-preview.1.26104.118 \ + DOTNET_SDK_VERSION=11.0.100-preview.2.final \ # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true \ # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile index 0667173e69..76964f64a1 100644 --- a/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile +++ b/src/sdk/11.0/windowsservercore-ltsc2025/amd64/Dockerfile @@ -25,12 +25,13 @@ RUN powershell -Command " ` $ProgressPreference = 'SilentlyContinue'; ` ` # Retrieve .NET SDK - $dotnet_sdk_version = '11.0.100-preview.1.26104.118'; ` - $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` - $dotnet_sha512_file = $dotnet_file + '.sha512-bare'; ` + $dotnet_sdk_version = '11.0.100-preview.2.26155.102'; ` + $dotnet_sdk_file_version = '11.0.100-preview.2.final'; ` + $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_file_version + '-win-x64.zip'; ` + $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` - Invoke-WebRequest -OutFile $dotnet_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_file; ` - Invoke-WebRequest -OutFile $dotnet_sha512_file https://builds.dotnet.microsoft.com/dotnet/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; ` + Invoke-WebRequest -OutFile $dotnet_file https://ci.dot.net/public/Sdk/$dotnet_sdk_version/$dotnet_file; ` + Invoke-WebRequest -OutFile $dotnet_sha512_file https://ci.dot.net/public-checksums/Sdk/$dotnet_sdk_version/$dotnet_sha512_file; ` ` if ((Get-FileHash $dotnet_file -Algorithm sha512).Hash -ne (Get-Content $dotnet_sha512_file)) { ` Write-Host 'CHECKSUM VERIFICATION FAILED!'; ` @@ -64,7 +65,7 @@ RUN powershell -Command " ` # SDK image -FROM $REPO:11.0.0-preview.1-windowsservercore-ltsc2025 +FROM $REPO:11.0.0-preview.2-windowsservercore-ltsc2025 ENV ` # Do not generate certificate @@ -72,7 +73,7 @@ ENV ` # Do not show first run text DOTNET_NOLOGO=true ` # SDK version - DOTNET_SDK_VERSION=11.0.100-preview.1.26104.118 ` + DOTNET_SDK_VERSION=11.0.100-preview.2.final ` # Enable correct mode for dotnet watch (only mode supported in a container) DOTNET_USE_POLLING_FILE_WATCHER=true ` # Skip extraction of XML docs - generally not useful within an image/container - helps performance diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt index 57cc13e47c..e49bb23c41 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt index fecc264cad..12d9f130d1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt index 8b582b3053..3ddde0ea96 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt index 934bed0d0b..5d6c84d437 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt index d4f7e29776..a89fca2e29 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt index 971ff2df28..0057586750 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt index e0b5d64300..2e57e6944b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm32v7-Dockerfile.approved.txt index a14ff3c1ee..7a9cd17d92 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm64v8-Dockerfile.approved.txt index a0c2ff4a9d..0f66c1466e 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-composite-extra-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Composite Image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt index 9ad16a77c0..ea85ab7290 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt index 943c45a2c4..a4f2871a16 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt index 3c5e0d5f4a..7bfd2ca361 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-musl-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-musl-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt index d5dfad3088..7e05b03ffb 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt @@ -11,15 +11,16 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt index c44ba14e88..7d55833591 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt @@ -11,15 +11,16 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt index 7903185595..56799d4c32 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt index 5bf3e8670b..3ee57dd1ba 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt index a1242a0b86..69c009f630 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-amd64-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt index a2b9dca9fa..823d687280 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-arm64v8-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt index 8342b60432..254a8e7e23 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-amd64-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt index c3128df0d3..6153d66fce 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-composite-extra-arm64v8-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt index 9e473c85ca..ada82e7899 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt index 55647a6beb..a3f5686c48 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512) aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt index c2cb3ef7d3..62f67b21d3 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt @@ -13,7 +13,8 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $aspnetcore_version = '0.0.0'; ` - $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` + $aspnetcore_file_version = '0.0.0'; ` + $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_file_version + '-win-x64.zip'; ` $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` $Headers = @{ ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt index 95e1542ef7..18c1de6619 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt index 0905fc0457..dbfb42cb01 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt index db97c2c6a5..bfa0aa1ed6 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt index 0bc5f6e7c7..9e6545e979 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt index a37f64045f..4f3de89ae4 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt index 11258b5de3..8da1cdaddf 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt index 5b87c84de1..cfaa5b7300 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt index 157701fdfa..ff8a10d533 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt index 6175f132a6..6a71145b93 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt index e9caafdf3d..c9f6809e0d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt index 28ebae5394..f473f12d6e 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt index be8f037fff..bad86dce53 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-composite-extra-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Composite Runtime RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-composite-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-composite-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt index f83ae763fc..c35c8957d9 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-x64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-x64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt index 1a14adc929..2783260edd 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt index b5807fce68..5603729122 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve ASP.NET Core RUN aspnetcore_version=0.0.0 \ + && aspnetcore_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/aspnetcore/Runtime/$aspnetcore_version/aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ + && tar --gzip --extract --no-same-owner --file aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz --directory /dotnet ./shared/Microsoft.AspNetCore.App \ && rm \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz \ - aspnetcore-runtime-$aspnetcore_version-linux-arm64.tar.gz.sha512 + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz \ + aspnetcore-runtime-$aspnetcore_file_version-linux-arm64.tar.gz.sha512 # ASP.NET Core image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt index 0c0fc95cdf..d4362b0923 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspnet-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt @@ -13,7 +13,8 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $aspnetcore_version = '0.0.0'; ` - $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_version + '-win-x64.zip'; ` + $aspnetcore_file_version = '0.0.0'; ` + $aspnetcore_file = 'aspnetcore-runtime-' + $aspnetcore_file_version + '-win-x64.zip'; ` $dotnet_sha512_file = $aspnetcore_file + '.sha512'; ` ` $Headers = @{ ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt index 32b28e65af..974af2a703 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt index 531f790cac..5c39065cf9 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt index 3bb298e1ca..e6953988eb 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt index 970977d515..891b2a1f4c 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-x64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt index 319ebb6062..5f36fcecb3 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-arm.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt index aa51503f49..3f6c3c19f2 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-alpine3.23-extra-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz \ + https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-musl-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-musl-arm64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt index 1661f6e865..df000f65a4 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt @@ -11,15 +11,16 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt index 561daf3a1a..c1b92c38e4 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt @@ -11,15 +11,16 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt index c0eb0dfd5b..4dc54d7171 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-amd64-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt index 64f97a946d..f4afa7df48 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-arm64v8-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt index 7b89b776aa..9ffd1b876d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-amd64-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt index 660a144524..6a22a6ca3e 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-azurelinux3.0-distroless-extra-arm64v8-Dockerfile.approved.txt @@ -13,15 +13,16 @@ RUN tdnf install -y \ # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512) dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt index d4f1527b5a..5df0621e8a 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt @@ -11,7 +11,8 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $dotnet_version = '0.0.0'; ` - $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` + $dotnet_file_version = '0.0.0'; ` + $dotnet_file = 'dotnet-runtime-' + $dotnet_file_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` $Headers = @{ ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt index ef487ff40e..7b3fc7496d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt index 18bae7933b..e8042d7937 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt index a769da48c4..d6dfa88fca 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 # .NET runtime image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt index e6c59471ec..013bbd6532 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt index 555e4d1f18..9b84e1e8e1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt index dedb36674c..3c7f88082f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt index 0e3f915e43..844110968f 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-x64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-x64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-x64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt index b12db930e7..fc6ec1732b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-arm.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt index d9775a00e2..908899d466 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -7,15 +7,16 @@ ARG ACCESSTOKEN # Retrieve .NET Runtime RUN dotnet_version=0.0.0 \ + && dotnet_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Runtime/$dotnet_version/dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /usr/share/dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ + && tar --gzip --extract --no-same-owner --file dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz --directory /usr/share/dotnet \ && rm \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz \ - dotnet-runtime-$dotnet_version-linux-arm64.tar.gz.sha512 + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz \ + dotnet-runtime-$dotnet_file_version-linux-arm64.tar.gz.sha512 RUN mkdir /dotnet-symlink \ && ln -s /usr/share/dotnet/dotnet /dotnet-symlink/dotnet diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt index a161d997f0..169088e177 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt @@ -11,7 +11,8 @@ RUN powershell -Command ` $ProgressPreference = 'SilentlyContinue'; ` ` $dotnet_version = '0.0.0'; ` - $dotnet_file = 'dotnet-runtime-' + $dotnet_version + '-win-x64.zip'; ` + $dotnet_file_version = '0.0.0'; ` + $dotnet_file = 'dotnet-runtime-' + $dotnet_file_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` $Headers = @{ ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt index 79b4af5af5..453e0c2bab 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-amd64-Dockerfile.approved.txt @@ -15,7 +15,7 @@ RUN apt-get update \ # .NET dependencies libc6 \ libgcc-s1 \ - libicu76 \ + libicu78 \ libssl3t64 \ libstdc++6 \ tzdata \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt index 79b4af5af5..453e0c2bab 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm32v7-Dockerfile.approved.txt @@ -15,7 +15,7 @@ RUN apt-get update \ # .NET dependencies libc6 \ libgcc-s1 \ - libicu76 \ + libicu78 \ libssl3t64 \ libstdc++6 \ tzdata \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt index 79b4af5af5..453e0c2bab 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-arm64v8-Dockerfile.approved.txt @@ -15,7 +15,7 @@ RUN apt-get update \ # .NET dependencies libc6 \ libgcc-s1 \ - libicu76 \ + libicu78 \ libssl3t64 \ libstdc++6 \ tzdata \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt index 1d2ea4bfea..f132ffa5b0 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-amd64-Dockerfile.approved.txt @@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \ ca-certificates_data \ libc6_libs \ libgcc-s1_libs \ - libicu76_libs \ + libicu78_libs \ libssl3t64_libs \ libstdc++6_libs \ tzdata-legacy_zoneinfo \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt index 59ffe12e21..90f4819a93 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm32v7-Dockerfile.approved.txt @@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \ ca-certificates_data \ libc6_libs \ libgcc-s1_libs \ - libicu76_libs \ + libicu78_libs \ libssl3t64_libs \ libstdc++6_libs \ tzdata-legacy_zoneinfo \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt index 91e2dabd67..2ebdf760ac 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/runtime-deps-11.0-resolute-chiseled-extra-arm64v8-Dockerfile.approved.txt @@ -33,7 +33,7 @@ RUN mkdir --parents /rootfs/var/lib/dpkg/ \ ca-certificates_data \ libc6_libs \ libgcc-s1_libs \ - libicu76_libs \ + libicu78_libs \ libssl3t64_libs \ libstdc++6_libs \ tzdata-legacy_zoneinfo \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt index e5cce2b97f..b9ad426fd3 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-amd64-Dockerfile.approved.txt @@ -6,15 +6,16 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-x64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-x64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt index 34dc206b0e..315ebc8a29 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm32v7-Dockerfile.approved.txt @@ -6,15 +6,16 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-arm.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt index 691687fa4a..61fc072a90 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-alpine3.23-arm64v8-Dockerfile.approved.txt @@ -6,15 +6,16 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_file_version=0.0.0 \ && wget --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \ - https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz \ + https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-musl-arm64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-musl-arm64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt index 0f6b1c0d8c..7b8e0ac0df 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-amd64-Dockerfile.approved.txt @@ -10,15 +10,16 @@ RUN tdnf install -y \ # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt index cba4d6df79..e5e2f43235 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-azurelinux3.0-arm64v8-Dockerfile.approved.txt @@ -10,15 +10,16 @@ RUN tdnf install -y \ # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512) dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt index 126cf83a04..1ff9302686 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-nanoserver-ltsc2025-amd64-Dockerfile.approved.txt @@ -29,7 +29,8 @@ RUN ` ` # Retrieve .NET SDK $dotnet_sdk_version = '0.0.0'; ` - $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` + $dotnet_sdk_file_version = '0.0.0'; ` + $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_file_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` $Headers = @{ ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt index e4c89146c0..02aa5cbfe1 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-amd64-Dockerfile.approved.txt @@ -6,15 +6,16 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-x64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-x64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt index ed9910aabf..4ca3c626ea 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm32v7-Dockerfile.approved.txt @@ -6,15 +6,16 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-arm.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-arm.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt index e78f70f64f..09ec6c5eae 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-resolute-arm64v8-Dockerfile.approved.txt @@ -6,15 +6,16 @@ ARG ACCESSTOKEN # Install .NET SDK RUN dotnet_sdk_version=0.0.0 \ + && dotnet_sdk_file_version=0.0.0 \ && curl --header "Authorization: Bearer $ACCESSTOKEN" --header "x-ms-version: 2017-11-09" --fail --show-error --location \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 \ - && echo "$(cat dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz" | sha512sum -c - \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz \ + --remote-name https://dotnetstage.blob.core.windows.net/Sdk/$dotnet_sdk_version/dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 \ + && echo "$(cat dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512| tr 'A-F' 'a-f') dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz" | sha512sum -c - \ && mkdir --parents /dotnet \ - && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ + && tar --gzip --extract --no-same-owner --file dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz --directory /dotnet ./dnx ./packs ./sdk ./sdk-manifests ./templates ./LICENSE.txt ./ThirdPartyNotices.txt \ && rm \ - dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz \ - dotnet-sdk-$dotnet_sdk_version-linux-arm64.tar.gz.sha512 + dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz \ + dotnet-sdk-$dotnet_sdk_file_version-linux-arm64.tar.gz.sha512 # .NET SDK image diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt index 5aa5d6d377..2e0a706674 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt +++ b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/sdk-11.0-windowsservercore-ltsc2025-amd64-Dockerfile.approved.txt @@ -29,7 +29,8 @@ RUN ` ` # Retrieve .NET SDK $dotnet_sdk_version = '0.0.0'; ` - $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_version + '-win-x64.zip'; ` + $dotnet_sdk_file_version = '0.0.0'; ` + $dotnet_file = 'dotnet-sdk-' + $dotnet_sdk_file_version + '-win-x64.zip'; ` $dotnet_sha512_file = $dotnet_file + '.sha512'; ` ` $Headers = @{ ` diff --git a/tests/Microsoft.DotNet.Docker.Tests/Config.cs b/tests/Microsoft.DotNet.Docker.Tests/Config.cs index 6cb7b82020..2d87439fa7 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Config.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/Config.cs @@ -67,6 +67,20 @@ private static JObject LoadManifest(string manifestFile) public static string GetVariableValue(string variableName) => GetVariableValue(variableName, (JObject)ManifestVersions.Value["variables"]); + public static bool TryGetVariableValue(string variableName, out string value) + { + var variables = (JObject)ManifestVersions.Value["variables"]; + JToken token = variables[variableName]; + if (token is null) + { + value = string.Empty; + return false; + } + + value = ResolveVariables((string)token, variables); + return true; + } + private static string GetVariableValue(string variableName, JObject variables) => ResolveVariables((string)variables[variableName], variables); diff --git a/tests/Microsoft.DotNet.Docker.Tests/DockerfileHelper.cs b/tests/Microsoft.DotNet.Docker.Tests/DockerfileHelper.cs index c281972f63..d42b98fabc 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/DockerfileHelper.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/DockerfileHelper.cs @@ -19,8 +19,8 @@ public static partial class DockerfileHelper [GeneratedRegex("[A-Fa-f0-9]{64}")] public static partial Regex Sha256Regex { get; } - // Match versions like `1.2.3`, `1.2.3.4`, `1.2.3-foo.45678.9`, and `1.2.3-preview.4.56789.0` - [GeneratedRegex(@"\d+\.\d+\.\d+(\.\d+)?(-[A-Za-z]+(\.\d+)+)?")] + // Match versions like `1.2.3`, `1.2.3.4`, `1.2.3-foo.45678.9`, `1.2.3-preview.4.56789.0`, and `1.2.3-preview.4.final` + [GeneratedRegex(@"\d+\.\d+\.\d+(\.\d+)?(-[A-Za-z]+(\.\d+)+(\.final)?)?")] public static partial Regex VersionRegex { get; } // Match unstable versions that have been partially replaced with variables, diff --git a/tests/Microsoft.DotNet.Docker.Tests/FileHelper.cs b/tests/Microsoft.DotNet.Docker.Tests/FileHelper.cs index 8d0b2235b5..fcedd66b0b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/FileHelper.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/FileHelper.cs @@ -16,9 +16,9 @@ public static TempFolderContext UseTempFolder() return new TempFolderContext(); } - public static TempFileContext UseTempFile() + public static TempFileContext UseTempFile(string name = null) { - return new TempFileContext(); + return new TempFileContext(name); } /// @@ -83,15 +83,29 @@ public void Dispose() public sealed class TempFileContext : IDisposable { - public TempFileContext() + private readonly string _folder; + + public TempFileContext(string name = null) { + string folder; do { - Path = System.IO.Path.Combine( + folder = System.IO.Path.Combine( System.IO.Path.GetTempPath(), Guid.NewGuid().ToString()); } - while (File.Exists(Path)); + while (Directory.Exists(folder)); + + if (name is not null) + { + _folder = folder; + Directory.CreateDirectory(folder); + Path = System.IO.Path.Combine(folder, name); + } + else + { + Path = folder; + } File.Create(Path).Dispose(); } @@ -100,7 +114,14 @@ public TempFileContext() public void Dispose() { - File.Delete(Path); + if (_folder is not null) + { + Directory.Delete(_folder, true); + } + else + { + File.Delete(Path); + } } } } diff --git a/tests/Microsoft.DotNet.Docker.Tests/Microsoft.DotNet.Docker.Tests.csproj b/tests/Microsoft.DotNet.Docker.Tests/Microsoft.DotNet.Docker.Tests.csproj index e72fcffb52..cbe6c0229b 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/Microsoft.DotNet.Docker.Tests.csproj +++ b/tests/Microsoft.DotNet.Docker.Tests/Microsoft.DotNet.Docker.Tests.csproj @@ -15,7 +15,6 @@ - diff --git a/tests/Microsoft.DotNet.Docker.Tests/PowerShellTests.cs b/tests/Microsoft.DotNet.Docker.Tests/PowerShellTests.cs index 9564c9a3ba..d125daa3f6 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/PowerShellTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/PowerShellTests.cs @@ -15,8 +15,6 @@ using System.Threading.Tasks; using Polly; using Polly.Retry; -using SharpCompress.Common; -using SharpCompress.Readers; using Xunit; using Xunit.Abstractions; diff --git a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs index e49d92bbfe..668b9f86c8 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ProductImageTests.cs @@ -47,6 +47,13 @@ protected void VerifyCommonInsecureFiles(ProductImageData imageData) return; } + if (imageData.OS.IsUnstable) + { + OutputHelper.WriteLine("Skipping insecure files check for unstable OS." + + " Remove this check when https://github.com/dotnet/dotnet-docker/issues/7054 is resolved."); + return; + } + string rootFsPath = imageData.IsDistroless ? "/rootfs" : "/"; string worldWritableDirectoriesWithoutStickyBitCmd = $@"find {rootFsPath} -xdev -type d \( -perm -0002 -a ! -perm -1000 \)"; diff --git a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs index 9fb098b44f..85dae83cbe 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs @@ -14,8 +14,8 @@ using System.Threading.Tasks; using Polly; using Polly.Retry; -using SharpCompress.Common; -using SharpCompress.Readers; +using System.Formats.Tar; +using System.IO.Compression; using Xunit; using Xunit.Abstractions; @@ -148,8 +148,8 @@ public async Task VerifyDotnetFolderContents(ProductImageData imageData) IEnumerable actualDotnetFiles = GetActualSdkContents(imageData); IEnumerable expectedDotnetFiles = await GetExpectedSdkContentsAsync(imageData); - using TempFileContext actualFilesContext = FileHelper.UseTempFile(); - using TempFileContext expectedFilesContext = FileHelper.UseTempFile(); + using TempFileContext actualFilesContext = FileHelper.UseTempFile("container-image"); + using TempFileContext expectedFilesContext = FileHelper.UseTempFile("sdk-archive"); File.WriteAllLines(actualFilesContext.Path, actualDotnetFiles.Select(file => $"{file.Path} {file.Sha512}")); File.WriteAllLines(expectedFilesContext.Path, expectedDotnetFiles.Select(file => $"{file.Path} {file.Sha512}")); @@ -234,7 +234,16 @@ private IEnumerable GetActualSdkContents(ProductImageData im { dotnetPath = "/usr/share/dotnet"; destinationPath = "/sdk"; - command = $"find {destinationPath} -type f -exec sha512sum {{}} +"; + + // Alpine's BusyBox find doesn't support comma-separated types (-type f,l) + if (imageData.SdkOS.Family == OSFamily.Alpine) + { + command = $"find {destinationPath} ( -type f -o -type l ) -exec sha512sum {{}} +"; + } + else + { + command = $"find {destinationPath} -type f,l -exec sha512sum {{}} +"; + } } else { @@ -280,23 +289,6 @@ private IEnumerable GetActualSdkContents(ProductImageData im .OrderBy(fileInfo => fileInfo.Path); } - private static IEnumerable EnumerateArchiveContents(string path) - { - using FileStream fileStream = File.OpenRead(path); - using IReader reader = ReaderFactory.Open(fileStream); - using TempFolderContext tempFolderContext = FileHelper.UseTempFolder(); - reader.WriteAllToDirectory(tempFolderContext.Path, new ExtractionOptions() { ExtractFullPath = true }); - - foreach (FileInfo file in new DirectoryInfo(tempFolderContext.Path).EnumerateFiles("*", SearchOption.AllDirectories)) - { - using SHA512 sha512 = SHA512.Create(); - byte[] sha512HashBytes = sha512.ComputeHash(File.ReadAllBytes(file.FullName)); - string sha512Hash = BitConverter.ToString(sha512HashBytes).Replace("-", string.Empty); - yield return new SdkContentFileInfo( - file.FullName.Substring(tempFolderContext.Path.Length), sha512Hash); - } - } - private async Task> GetExpectedSdkContentsAsync(ProductImageData imageData) { string sdkUrl = GetSdkUrl(imageData); @@ -312,7 +304,31 @@ await s_sdkDownloadPipeline.ExecuteAsync(async cancellationToken => await s_httpClient.DownloadFileAsync(new Uri(sdkUrl), sdkFile); }); - files = EnumerateArchiveContents(sdkFile) + using TempFolderContext extractFolder = FileHelper.UseTempFolder(); + + if (Path.GetExtension(sdkUrl).Equals(".zip", StringComparison.OrdinalIgnoreCase)) + { + ZipFile.ExtractToDirectory(sdkFile, extractFolder.Path); + } + else + { + using FileStream fileStream = File.OpenRead(sdkFile); + using var gzipStream = new GZipStream(fileStream, CompressionMode.Decompress); + TarFile.ExtractToDirectory(gzipStream, extractFolder.Path, overwriteFiles: false); + } + + files = Directory.EnumerateFiles(extractFolder.Path, "*", SearchOption.AllDirectories) + .Select(file => + { + string filePath = Path.GetFullPath(file); + string relativePath = Path.GetRelativePath(extractFolder.Path, filePath); + + byte[] fileData = File.ReadAllBytes(filePath); + byte[] sha512HashBytes = SHA512.HashData(fileData); + string sha512Hash = Convert.ToHexString(sha512HashBytes); + + return new SdkContentFileInfo(relativePath, sha512Hash); + }) .OrderBy(file => file.Path) .ToArray(); @@ -331,11 +347,20 @@ private static string GetSdkVersionFileLabel(string sdkBuildVersion, string dotn || sdkBuildVersion.Contains("-servicing") || sdkBuildVersion.Contains("-rtm"); - string sdkVersionFile = isStableBranding - ? Config.GetVariableValue($"sdk|{dotnetVersion}|product-version") - : sdkBuildVersion; + if (isStableBranding) + { + return Config.GetVariableValue($"sdk|{dotnetVersion}|product-version"); + } + + bool useFinalVersion = + Config.TryGetVariableValue($"sdk|{dotnetVersion}|use-final-version", out string finalFlag) + && finalFlag == "true"; + if (useFinalVersion) + { + return Config.GetVariableValue($"sdk|{dotnetVersion}|product-version") + ".final"; + } - return sdkVersionFile; + return sdkBuildVersion; } private string GetSdkUrl(ProductImageData imageData) diff --git a/tests/UpdateDependencies.Tests/FromStagingPipelineCommandTests.cs b/tests/UpdateDependencies.Tests/FromStagingPipelineCommandTests.cs index 345d5bd318..22f397275a 100644 --- a/tests/UpdateDependencies.Tests/FromStagingPipelineCommandTests.cs +++ b/tests/UpdateDependencies.Tests/FromStagingPipelineCommandTests.cs @@ -26,7 +26,7 @@ public async Task ExecuteAsync_InternalMode_AddsBuildTagWithStageContainer() var options = new FromStagingPipelineOptions { - StageContainer = stageContainer, + StageContainers = stageContainer, Internal = true, StagingStorageAccount = "https://dotnetstagetest.blob.core.windows.net/", Mode = ChangeMode.Local, @@ -50,7 +50,7 @@ public async Task ExecuteAsync_NotInternalMode_DoesNotAddBuildTag() var options = new FromStagingPipelineOptions { - StageContainer = "stage-1234567", + StageContainers = "stage-1234567", Internal = false, Mode = ChangeMode.Local, RepoRoot = "/tmp/repo" @@ -67,13 +67,7 @@ public async Task ExecuteAsync_NotInternalMode_DoesNotAddBuildTag() [InlineData("stage-999999999", 999999999)] public void GetStagingPipelineRunId_ValidStageContainer_ReturnsExpectedId(string stageContainer, int expectedId) { - var options = new FromStagingPipelineOptions - { - StageContainer = stageContainer, - RepoRoot = "/tmp/repo" - }; - - var result = options.GetStagingPipelineRunId(); + var result = StagingPipelineOptionsExtensions.GetStagingPipelineRunId(stageContainer); result.ShouldBe(expectedId); } @@ -85,16 +79,46 @@ public void GetStagingPipelineRunId_ValidStageContainer_ReturnsExpectedId(string [InlineData("stage-")] [InlineData("")] public void GetStagingPipelineRunId_InvalidStageContainer_ThrowsArgumentException(string stageContainer) + { + var exception = Should.Throw(() => + StagingPipelineOptionsExtensions.GetStagingPipelineRunId(stageContainer)); + exception.Message.ShouldContain($"Invalid stage container name '{stageContainer}'"); + exception.Message.ShouldContain("Expected format: 'stage-{buildId}'"); + } + + [Theory] + [InlineData("stage-1234567", new[] { "stage-1234567" })] + [InlineData("stage-1234567,stage-2345678", new[] { "stage-1234567", "stage-2345678" })] + [InlineData("stage-1234567, stage-2345678, stage-3456789", new[] { "stage-1234567", "stage-2345678", "stage-3456789" })] + [InlineData(" stage-1234567 , stage-2345678 ", new[] { "stage-1234567", "stage-2345678" })] + public void GetStageContainerList_ParsesCommaDelimitedList(string input, string[] expected) { var options = new FromStagingPipelineOptions { - StageContainer = stageContainer, + StageContainers = input, RepoRoot = "/tmp/repo" }; - var exception = Should.Throw(() => options.GetStagingPipelineRunId()); - exception.Message.ShouldContain($"Invalid stage container name '{stageContainer}'"); - exception.Message.ShouldContain("Expected format: 'stage-{buildId}'"); + var result = options.GetStageContainerList(); + + result.ShouldBe(expected); + } + + [Theory] + [InlineData("")] + [InlineData(" ")] + [InlineData(",,,")] + public void GetStageContainerList_EmptyOrWhitespace_ReturnsEmptyList(string input) + { + var options = new FromStagingPipelineOptions + { + StageContainers = input, + RepoRoot = "/tmp/repo" + }; + + var result = options.GetStageContainerList(); + + result.ShouldBeEmpty(); } private static FromStagingPipelineCommand CreateCommand( diff --git a/tests/UpdateDependencies.Tests/SyncInternalReleaseTests.cs b/tests/UpdateDependencies.Tests/SyncInternalReleaseTests.cs index 352fb25012..d3e3487a79 100644 --- a/tests/UpdateDependencies.Tests/SyncInternalReleaseTests.cs +++ b/tests/UpdateDependencies.Tests/SyncInternalReleaseTests.cs @@ -249,7 +249,7 @@ public async Task Sync() fromStagingPipelineCommandMock.Verify(command => command.ExecuteAsync(It.Is(o => o.RepoRoot == LocalRepoPath - && o.StageContainer == stageContainer + && o.StageContainers == stageContainer && o.StagingStorageAccount == options.StagingStorageAccount )), Times.Once