From 3c216a5a8a59fa7bb33532d60e571fd79d48df0a Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 10 Jan 2024 10:55:23 -0800 Subject: [PATCH] Fix incorrectly tagged Alpine SDK image (Remove PowerShell Alpine Arm tagging workaround) (#5096) --- README.sdk.md | 12 ++++++------ manifest.json | 12 ++++++------ manifest.versions.json | 3 --- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/README.sdk.md b/README.sdk.md index b93e1dca4..6aba0fafe 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -86,19 +86,19 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- 8.0.101-bookworm-slim-arm64v8, 8.0-bookworm-slim-arm64v8, 8.0.101-bookworm-slim, 8.0-bookworm-slim, 8.0.101, 8.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 -8.0.100-alpine3.18-arm64v8, 8.0-alpine3.18-arm64v8, 8.0-alpine-arm64v8, 8.0.101-alpine3.18, 8.0-alpine3.18, 8.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/alpine3.18/arm64v8/Dockerfile) | Alpine 3.18 +8.0.101-alpine3.18-arm64v8, 8.0-alpine3.18-arm64v8, 8.0-alpine-arm64v8, 8.0.101-alpine3.18, 8.0-alpine3.18, 8.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/alpine3.18/arm64v8/Dockerfile) | Alpine 3.18 8.0.101-alpine3.19-arm64v8, 8.0-alpine3.19-arm64v8, 8.0.101-alpine3.19, 8.0-alpine3.19 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/alpine3.19/arm64v8/Dockerfile) | Alpine 3.19 8.0.101-jammy-arm64v8, 8.0-jammy-arm64v8, 8.0.101-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04 8.0.101-cbl-mariner2.0-arm64v8, 8.0-cbl-mariner2.0-arm64v8, 8.0-cbl-mariner-arm64v8, 8.0.101-cbl-mariner2.0, 8.0-cbl-mariner2.0, 8.0-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/cbl-mariner2.0/arm64v8/Dockerfile) | CBL-Mariner 2.0 7.0.405-bookworm-slim-arm64v8, 7.0-bookworm-slim-arm64v8, 7.0.405-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 7.0.405-bullseye-slim-arm64v8, 7.0-bullseye-slim-arm64v8, 7.0.405-bullseye-slim, 7.0-bullseye-slim, 7.0.405, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 -7.0.404-alpine3.18-arm64v8, 7.0-alpine3.18-arm64v8, 7.0-alpine-arm64v8, 7.0.405-alpine3.18, 7.0-alpine3.18, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.18/arm64v8/Dockerfile) | Alpine 3.18 +7.0.405-alpine3.18-arm64v8, 7.0-alpine3.18-arm64v8, 7.0-alpine-arm64v8, 7.0.405-alpine3.18, 7.0-alpine3.18, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.18/arm64v8/Dockerfile) | Alpine 3.18 7.0.405-alpine3.19-arm64v8, 7.0-alpine3.19-arm64v8, 7.0.405-alpine3.19, 7.0-alpine3.19 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.19/arm64v8/Dockerfile) | Alpine 3.19 7.0.405-jammy-arm64v8, 7.0-jammy-arm64v8, 7.0.405-jammy, 7.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04 7.0.405-cbl-mariner2.0-arm64v8, 7.0-cbl-mariner2.0-arm64v8, 7.0-cbl-mariner-arm64v8, 7.0.405-cbl-mariner2.0, 7.0-cbl-mariner2.0, 7.0-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/cbl-mariner2.0/arm64v8/Dockerfile) | CBL-Mariner 2.0 6.0.418-bookworm-slim-arm64v8, 6.0-bookworm-slim-arm64v8, 6.0.418-bookworm-slim, 6.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bookworm-slim/arm64v8/Dockerfile) | Debian 12 6.0.418-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.418-bullseye-slim, 6.0-bullseye-slim, 6.0.418, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 -6.0.417-alpine3.18-arm64v8, 6.0-alpine3.18-arm64v8, 6.0-alpine-arm64v8, 6.0.418-alpine3.18, 6.0-alpine3.18, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.18/arm64v8/Dockerfile) | Alpine 3.18 +6.0.418-alpine3.18-arm64v8, 6.0-alpine3.18-arm64v8, 6.0-alpine-arm64v8, 6.0.418-alpine3.18, 6.0-alpine3.18, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.18/arm64v8/Dockerfile) | Alpine 3.18 6.0.418-alpine3.19-arm64v8, 6.0-alpine3.19-arm64v8, 6.0.418-alpine3.19, 6.0-alpine3.19 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.19/arm64v8/Dockerfile) | Alpine 3.19 6.0.418-jammy-arm64v8, 6.0-jammy-arm64v8, 6.0.418-jammy, 6.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/jammy/arm64v8/Dockerfile) | Ubuntu 22.04 6.0.418-cbl-mariner2.0-arm64v8, 6.0-cbl-mariner2.0-arm64v8, 6.0-cbl-mariner-arm64v8, 6.0.418-cbl-mariner2.0, 6.0-cbl-mariner2.0, 6.0-cbl-mariner | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/cbl-mariner2.0/arm64v8/Dockerfile) | CBL-Mariner 2.0 @@ -108,17 +108,17 @@ Tags | Dockerfile | OS Version Tags | Dockerfile | OS Version -----------| -------------| ------------- 8.0.101-bookworm-slim-arm32v7, 8.0-bookworm-slim-arm32v7, 8.0.101-bookworm-slim, 8.0-bookworm-slim, 8.0.101, 8.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 -8.0.100-alpine3.18-arm32v7, 8.0-alpine3.18-arm32v7, 8.0-alpine-arm32v7, 8.0.101-alpine3.18, 8.0-alpine3.18, 8.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/alpine3.18/arm32v7/Dockerfile) | Alpine 3.18 +8.0.101-alpine3.18-arm32v7, 8.0-alpine3.18-arm32v7, 8.0-alpine-arm32v7, 8.0.101-alpine3.18, 8.0-alpine3.18, 8.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/alpine3.18/arm32v7/Dockerfile) | Alpine 3.18 8.0.101-alpine3.19-arm32v7, 8.0-alpine3.19-arm32v7, 8.0.101-alpine3.19, 8.0-alpine3.19 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/alpine3.19/arm32v7/Dockerfile) | Alpine 3.19 8.0.101-jammy-arm32v7, 8.0-jammy-arm32v7, 8.0.101-jammy, 8.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/8.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04 7.0.405-bookworm-slim-arm32v7, 7.0-bookworm-slim-arm32v7, 7.0.405-bookworm-slim, 7.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 7.0.405-bullseye-slim-arm32v7, 7.0-bullseye-slim-arm32v7, 7.0.405-bullseye-slim, 7.0-bullseye-slim, 7.0.405, 7.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 -7.0.404-alpine3.18-arm32v7, 7.0-alpine3.18-arm32v7, 7.0-alpine-arm32v7, 7.0.405-alpine3.18, 7.0-alpine3.18, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.18/arm32v7/Dockerfile) | Alpine 3.18 +7.0.405-alpine3.18-arm32v7, 7.0-alpine3.18-arm32v7, 7.0-alpine-arm32v7, 7.0.405-alpine3.18, 7.0-alpine3.18, 7.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.18/arm32v7/Dockerfile) | Alpine 3.18 7.0.405-alpine3.19-arm32v7, 7.0-alpine3.19-arm32v7, 7.0.405-alpine3.19, 7.0-alpine3.19 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/alpine3.19/arm32v7/Dockerfile) | Alpine 3.19 7.0.405-jammy-arm32v7, 7.0-jammy-arm32v7, 7.0.405-jammy, 7.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/7.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04 6.0.418-bookworm-slim-arm32v7, 6.0-bookworm-slim-arm32v7, 6.0.418-bookworm-slim, 6.0-bookworm-slim | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bookworm-slim/arm32v7/Dockerfile) | Debian 12 6.0.418-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.418-bullseye-slim, 6.0-bullseye-slim, 6.0.418, 6.0 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 -6.0.417-alpine3.18-arm32v7, 6.0-alpine3.18-arm32v7, 6.0-alpine-arm32v7, 6.0.418-alpine3.18, 6.0-alpine3.18, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.18/arm32v7/Dockerfile) | Alpine 3.18 +6.0.418-alpine3.18-arm32v7, 6.0-alpine3.18-arm32v7, 6.0-alpine-arm32v7, 6.0.418-alpine3.18, 6.0-alpine3.18, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.18/arm32v7/Dockerfile) | Alpine 3.18 6.0.418-alpine3.19-arm32v7, 6.0-alpine3.19-arm32v7, 6.0.418-alpine3.19, 6.0-alpine3.19 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.19/arm32v7/Dockerfile) | Alpine 3.19 6.0.418-jammy-arm32v7, 6.0-jammy-arm32v7, 6.0.418-jammy, 6.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/jammy/arm32v7/Dockerfile) | Ubuntu 22.04 6.0.418-focal-arm32v7, 6.0-focal-arm32v7, 6.0.418-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04 diff --git a/manifest.json b/manifest.json index c62ddf752..75649c3ec 100644 --- a/manifest.json +++ b/manifest.json @@ -5962,7 +5962,7 @@ "os": "linux", "osVersion": "alpine3.18", "tags": { - "$(sdk|6.0|alpine-arm-product-version)-alpine3.18-arm32v7": {}, + "$(sdk|6.0|product-version)-alpine3.18-arm32v7": {}, "6.0-alpine3.18-arm32v7": {}, "6.0-alpine-arm32v7": {} }, @@ -5978,7 +5978,7 @@ "os": "linux", "osVersion": "alpine3.18", "tags": { - "$(sdk|6.0|alpine-arm-product-version)-alpine3.18-arm64v8": {}, + "$(sdk|6.0|product-version)-alpine3.18-arm64v8": {}, "6.0-alpine3.18-arm64v8": {}, "6.0-alpine-arm64v8": {} }, @@ -6424,7 +6424,7 @@ "os": "linux", "osVersion": "alpine3.18", "tags": { - "$(sdk|7.0|alpine-arm-product-version)-alpine3.18-arm32v7": {}, + "$(sdk|7.0|product-version)-alpine3.18-arm32v7": {}, "7.0-alpine3.18-arm32v7": {}, "7.0-alpine-arm32v7": {} }, @@ -6440,7 +6440,7 @@ "os": "linux", "osVersion": "alpine3.18", "tags": { - "$(sdk|7.0|alpine-arm-product-version)-alpine3.18-arm64v8": {}, + "$(sdk|7.0|product-version)-alpine3.18-arm64v8": {}, "7.0-alpine3.18-arm64v8": {}, "7.0-alpine-arm64v8": {} }, @@ -6757,7 +6757,7 @@ "os": "linux", "osVersion": "alpine3.18", "tags": { - "$(sdk|8.0|alpine-arm-product-version)-alpine3.18-arm32v7": {}, + "$(sdk|8.0|product-version)-alpine3.18-arm32v7": {}, "8.0-alpine3.18-arm32v7": {}, "8.0-alpine-arm32v7": {} }, @@ -6773,7 +6773,7 @@ "os": "linux", "osVersion": "alpine3.18", "tags": { - "$(sdk|8.0|alpine-arm-product-version)-alpine3.18-arm64v8": {}, + "$(sdk|8.0|product-version)-alpine3.18-arm64v8": {}, "8.0-alpine3.18-arm64v8": {}, "8.0-alpine-arm64v8": {} }, diff --git a/manifest.versions.json b/manifest.versions.json index 4eca311cf..fa48e4495 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -184,7 +184,6 @@ "sdk|6.0|build-version": "6.0.418", "sdk|6.0|product-version": "6.0.418", - "sdk|6.0|alpine-arm-product-version": "6.0.417", "sdk|6.0|linux-musl|arm|sha": "6a6967a94ca704f659d47b47e179cdd2336bcf9446d3a78bd84148eb122f0a56b85ef8a35052b297780d498138d9a58e87778d61f808500567a981e97aee0c19", "sdk|6.0|linux-musl|arm64|sha": "f9534a747826ca653910d0180ead9cda04e803aae49eadfea21fcc09f8aafc1b39dcc64dce5e8d561f899605df260962a917b00ecc15866fc606d08aacf09b75", "sdk|6.0|linux-musl|x64|sha": "4815072e8f9680df72a8ca84b11d109a092ae50cefb12e96613a62216136784b9972d7aac8a5db3ad0ca7b4fa630b4694fb72d926382ea798ed8bdaffe591cfc", @@ -197,7 +196,6 @@ "sdk|7.0|build-version": "7.0.405", "sdk|7.0|product-version": "7.0.405", - "sdk|7.0|alpine-arm-product-version": "7.0.404", "sdk|7.0|linux-musl|arm|sha": "5e957d5e8fa67929b43594a414c73febea6769e993ceab9ae792c2aed111d986b302db2aac81d8d59c58b2f173c52cea6a8aa3619c9bcfa962476fdf3167ccee", "sdk|7.0|linux-musl|arm64|sha": "b27720f523660ee24e8b539dae804683bae58ef8a669c9f62e6b7afc4e0b352edd7f1c7cca6c541563a312fa5e2e3ee756930f93b2f49c89860d19cc8651c8d8", "sdk|7.0|linux-musl|x64|sha": "c061e969af85ab30e28425e457674cdf062bb1ca9ce8c10d450a9b31cfc543cd6a6b6bc22db521a063ad39441e6d2b1cc599f84132a3b7393659fc959e3789d2", @@ -208,7 +206,6 @@ "sdk|8.0|build-version": "8.0.101", "sdk|8.0|product-version": "8.0.101", - "sdk|8.0|alpine-arm-product-version": "8.0.100", "sdk|8.0|linux-musl|arm|sha": "764edb8803a68f074391714029800ef2309d212618790ba00506bba201a9655ea46e47d6017c89d78c9b1ef57e8e47352a63e8116a8b1f9fb169844745170172", "sdk|8.0|linux-musl|arm64|sha": "796d9fa4fda9d7d0f014820e20a8bad63052ba5e15dcb4fcb44ce33438a1aa4cd5e2ea0ad4a538b07946302b9649638762e3bfaa22a70318f0f17bc50c105193", "sdk|8.0|linux-musl|x64|sha": "95751235b774ed1050b721528495c1ba561c0bce99989a5fd6c0d0510b8b7d07a34ef186f347d16194b07d5ec4966ae8cb47aa7c1a65eebcea8a68fd90fb22e5",