diff --git a/README.sdk.md b/README.sdk.md index 5f5b553a4f..95e72ee5f3 100644 --- a/README.sdk.md +++ b/README.sdk.md @@ -54,11 +54,11 @@ The following samples show how to develop, build and test .NET applications with ## Linux amd64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.400-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.400-bullseye-slim, 6.0-bullseye-slim, 6.0.400, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11 -6.0.400-alpine3.16-amd64, 6.0-alpine3.16-amd64, 6.0-alpine-amd64, 6.0.400-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/amd64/Dockerfile) | Alpine 3.16 -6.0.400-alpine3.15-amd64, 6.0-alpine3.15-amd64, 6.0.400-alpine3.15, 6.0-alpine3.15 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.15/amd64/Dockerfile) | Alpine 3.15 -6.0.400-jammy-amd64, 6.0-jammy-amd64, 6.0.400-jammy, 6.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/jammy/amd64/Dockerfile) | Ubuntu 22.04 -6.0.400-focal-amd64, 6.0-focal-amd64, 6.0.400-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/amd64/Dockerfile) | Ubuntu 20.04 +6.0.400-1-bullseye-slim-amd64, 6.0-bullseye-slim-amd64, 6.0.400-1-bullseye-slim, 6.0-bullseye-slim, 6.0.400-1, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/amd64/Dockerfile) | Debian 11 +6.0.400-1-alpine3.16-amd64, 6.0-alpine3.16-amd64, 6.0-alpine-amd64, 6.0.400-1-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/amd64/Dockerfile) | Alpine 3.16 +6.0.400-1-alpine3.15-amd64, 6.0-alpine3.15-amd64, 6.0.400-1-alpine3.15, 6.0-alpine3.15 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.15/amd64/Dockerfile) | Alpine 3.15 +6.0.400-1-jammy-amd64, 6.0-jammy-amd64, 6.0.400-1-jammy, 6.0-jammy | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/jammy/amd64/Dockerfile) | Ubuntu 22.04 +6.0.400-1-focal-amd64, 6.0-focal-amd64, 6.0.400-1-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/amd64/Dockerfile) | Ubuntu 20.04 3.1.422-bullseye, 3.1-bullseye | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/bullseye/amd64/Dockerfile) | Debian 11 3.1.422-buster, 3.1-buster, 3.1.422, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/buster/amd64/Dockerfile) | Debian 10 3.1.422-alpine3.16, 3.1-alpine3.16, 3.1-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/alpine3.16/amd64/Dockerfile) | Alpine 3.16 @@ -76,11 +76,11 @@ Tags | Dockerfile | OS Version ## Linux arm64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.400-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.400-bullseye-slim, 6.0-bullseye-slim, 6.0.400, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 -6.0.400-alpine3.16-arm64v8, 6.0-alpine3.16-arm64v8, 6.0-alpine-arm64v8, 6.0.400-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/arm64v8/Dockerfile) | Alpine 3.16 -6.0.400-alpine3.15-arm64v8, 6.0-alpine3.15-arm64v8, 6.0.400-alpine3.15, 6.0-alpine3.15 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.15/arm64v8/Dockerfile) | Alpine 3.15 -6.0.400-jammy-arm64v8, 6.0-jammy-arm64v8, 6.0.400-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.400-focal-arm64v8, 6.0-focal-arm64v8, 6.0.400-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04 +6.0.400-1-bullseye-slim-arm64v8, 6.0-bullseye-slim-arm64v8, 6.0.400-1-bullseye-slim, 6.0-bullseye-slim, 6.0.400-1, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile) | Debian 11 +6.0.400-1-alpine3.16-arm64v8, 6.0-alpine3.16-arm64v8, 6.0-alpine-arm64v8, 6.0.400-1-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/arm64v8/Dockerfile) | Alpine 3.16 +6.0.400-1-alpine3.15-arm64v8, 6.0-alpine3.15-arm64v8, 6.0.400-1-alpine3.15, 6.0-alpine3.15 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.15/arm64v8/Dockerfile) | Alpine 3.15 +6.0.400-1-jammy-arm64v8, 6.0-jammy-arm64v8, 6.0.400-1-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.400-1-focal-arm64v8, 6.0-focal-arm64v8, 6.0.400-1-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04 3.1.422-bullseye-arm64v8, 3.1-bullseye-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/bullseye/arm64v8/Dockerfile) | Debian 11 3.1.422-buster-arm64v8, 3.1-buster-arm64v8, 3.1.422, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/buster/arm64v8/Dockerfile) | Debian 10 3.1.422-focal-arm64v8, 3.1-focal-arm64v8 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/focal/arm64v8/Dockerfile) | Ubuntu 20.04 @@ -96,11 +96,11 @@ Tags | Dockerfile | OS Version ## Linux arm32 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -6.0.400-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.400-bullseye-slim, 6.0-bullseye-slim, 6.0.400, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 -6.0.400-alpine3.16-arm32v7, 6.0-alpine3.16-arm32v7, 6.0-alpine-arm32v7, 6.0.400-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/arm32v7/Dockerfile) | Alpine 3.16 -6.0.400-alpine3.15-arm32v7, 6.0-alpine3.15-arm32v7, 6.0.400-alpine3.15, 6.0-alpine3.15 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.15/arm32v7/Dockerfile) | Alpine 3.15 -6.0.400-jammy-arm32v7, 6.0-jammy-arm32v7, 6.0.400-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.400-focal-arm32v7, 6.0-focal-arm32v7, 6.0.400-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04 +6.0.400-1-bullseye-slim-arm32v7, 6.0-bullseye-slim-arm32v7, 6.0.400-1-bullseye-slim, 6.0-bullseye-slim, 6.0.400-1, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile) | Debian 11 +6.0.400-1-alpine3.16-arm32v7, 6.0-alpine3.16-arm32v7, 6.0-alpine-arm32v7, 6.0.400-1-alpine3.16, 6.0-alpine3.16, 6.0-alpine | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.16/arm32v7/Dockerfile) | Alpine 3.16 +6.0.400-1-alpine3.15-arm32v7, 6.0-alpine3.15-arm32v7, 6.0.400-1-alpine3.15, 6.0-alpine3.15 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/alpine3.15/arm32v7/Dockerfile) | Alpine 3.15 +6.0.400-1-jammy-arm32v7, 6.0-jammy-arm32v7, 6.0.400-1-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.400-1-focal-arm32v7, 6.0-focal-arm32v7, 6.0.400-1-focal, 6.0-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/focal/arm32v7/Dockerfile) | Ubuntu 20.04 3.1.422-bullseye-arm32v7, 3.1-bullseye-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/bullseye/arm32v7/Dockerfile) | Debian 11 3.1.422-buster-arm32v7, 3.1-buster-arm32v7, 3.1.422, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/buster/arm32v7/Dockerfile) | Debian 10 3.1.422-focal-arm32v7, 3.1-focal-arm32v7 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/focal/arm32v7/Dockerfile) | Ubuntu 20.04 @@ -116,7 +116,7 @@ Tags | Dockerfile | OS Version ## Nano Server 2022 amd64 Tags Tag | Dockerfile ---------| --------------- -6.0.400-nanoserver-ltsc2022, 6.0-nanoserver-ltsc2022, 6.0.400, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/nanoserver-ltsc2022/amd64/Dockerfile) +6.0.400-nanoserver-ltsc2022, 6.0-nanoserver-ltsc2022, 6.0.400-1, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/nanoserver-ltsc2022/amd64/Dockerfile) 3.1.422-nanoserver-ltsc2022, 3.1-nanoserver-ltsc2022, 3.1.422, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/nanoserver-ltsc2022/amd64/Dockerfile) ##### .NET 7 Preview Tags @@ -137,7 +137,7 @@ Tag | Dockerfile ## Nano Server, version 1809 amd64 Tags Tag | Dockerfile ---------| --------------- -6.0.400-nanoserver-1809, 6.0-nanoserver-1809, 6.0.400, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/nanoserver-1809/amd64/Dockerfile) +6.0.400-nanoserver-1809, 6.0-nanoserver-1809, 6.0.400-1, 6.0, latest | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/6.0/nanoserver-1809/amd64/Dockerfile) 3.1.422-nanoserver-1809, 3.1-nanoserver-1809, 3.1.422, 3.1 | [Dockerfile](https://github.com/dotnet/dotnet-docker/blob/main/src/sdk/3.1/nanoserver-1809/amd64/Dockerfile) ##### .NET 7 Preview Tags diff --git a/eng/dockerfile-templates/monitor/Dockerfile b/eng/dockerfile-templates/monitor/Dockerfile index b5bb035e93..ea55458ddc 100644 --- a/eng/dockerfile-templates/monitor/Dockerfile +++ b/eng/dockerfile-templates/monitor/Dockerfile @@ -7,7 +7,7 @@ set targetFrameworkMonikerRegex to cat("net", dotnetMajor, "[.]0") ^ set isDistrolessMariner to defined(match(OS_VERSION, "^cbl-mariner\d+\.\d+-distroless$")) ^ set sdkDistro to when(isDistrolessMariner, cat("cbl-mariner", OS_VERSION_NUMBER), OS_VERSION) ^ - set installerBaseTag to cat(VARIABLES[cat("sdk|", dotnetMajorMinor, "|product-version")], "-", sdkDistro, ARCH_TAG_SUFFIX) ^ + set installerBaseTag to cat(VARIABLES[cat("sdk|", dotnetMajorMinor, "|product-version")], when(dotnetMajor = "6", "-1", ""), "-", sdkDistro, ARCH_TAG_SUFFIX) ^ set monitorMajorMinor to join(slice(split(PRODUCT_VERSION, "."), 0, 2), ".") ^ set buildVersion to VARIABLES[cat("monitor|", monitorMajorMinor, "|build-version")] ^ set monitorVersionVariable to when(find(buildVersion, '-rtm') >= 0 || find(buildVersion, '-servicing') >= 0, "product-version", "build-version") ^ diff --git a/eng/dockerfile-templates/sdk/Dockerfile.envs b/eng/dockerfile-templates/sdk/Dockerfile.envs index cfa58e1668..ac7bf81bcd 100644 --- a/eng/dockerfile-templates/sdk/Dockerfile.envs +++ b/eng/dockerfile-templates/sdk/Dockerfile.envs @@ -13,9 +13,7 @@ # Do not generate certificate DOTNET_GENERATE_ASPNET_CERTIFICATE=false {{lineContinuation}}{{if dotnetVersion != "3.1": # Do not show first run text - DOTNET_NOLOGO=true {{lineContinuation}}}}{{if !isWindows && dotnetVersion = "6.0": - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true {{lineContinuation}}}}{{if dotnetVersion != "3.1": + DOTNET_NOLOGO=true {{lineContinuation}}}}{{if dotnetVersion != "3.1": # SDK version DOTNET_SDK_VERSION={{VARIABLES[cat("sdk|", dotnetVersion, "|build-version")]}} {{lineContinuation}}}}{{if isAlpine: # Disable the invariant mode (set in base image) diff --git a/manifest.json b/manifest.json index ba3f2532ae..60807c0a67 100644 --- a/manifest.json +++ b/manifest.json @@ -4451,7 +4451,7 @@ { "productVersion": "$(sdk|6.0|product-version)", "sharedTags": { - "$(sdk|6.0|product-version)": {}, + "$(sdk|6.0|product-version)-1": {}, "6.0": {}, "latest": {} }, @@ -4465,7 +4465,7 @@ "os": "linux", "osVersion": "bullseye-slim", "tags": { - "$(sdk|6.0|product-version)-bullseye-slim-amd64": {}, + "$(sdk|6.0|product-version)-1-bullseye-slim-amd64": {}, "6.0-bullseye-slim-amd64": {} } }, @@ -4479,7 +4479,7 @@ "os": "linux", "osVersion": "bullseye-slim", "tags": { - "$(sdk|6.0|product-version)-bullseye-slim-arm32v7": {}, + "$(sdk|6.0|product-version)-1-bullseye-slim-arm32v7": {}, "6.0-bullseye-slim-arm32v7": {} }, "variant": "v7" @@ -4494,7 +4494,7 @@ "os": "linux", "osVersion": "bullseye-slim", "tags": { - "$(sdk|6.0|product-version)-bullseye-slim-arm64v8": {}, + "$(sdk|6.0|product-version)-1-bullseye-slim-arm64v8": {}, "6.0-bullseye-slim-arm64v8": {} }, "variant": "v8" @@ -4531,7 +4531,7 @@ "id": "bullseye-slim", "productVersion": "$(sdk|6.0|product-version)", "sharedTags": { - "$(sdk|6.0|product-version)-bullseye-slim": {}, + "$(sdk|6.0|product-version)-1-bullseye-slim": {}, "6.0-bullseye-slim": {} }, "platforms": [ @@ -4574,7 +4574,7 @@ { "productVersion": "$(sdk|6.0|product-version)", "sharedTags": { - "$(sdk|6.0|product-version)-alpine3.15": {}, + "$(sdk|6.0|product-version)-1-alpine3.15": {}, "6.0-alpine3.15": {} }, "platforms": [ @@ -4587,7 +4587,7 @@ "os": "linux", "osVersion": "alpine3.15", "tags": { - "$(sdk|6.0|product-version)-alpine3.15-amd64": {}, + "$(sdk|6.0|product-version)-1-alpine3.15-amd64": {}, "6.0-alpine3.15-amd64": {} } }, @@ -4601,7 +4601,7 @@ "os": "linux", "osVersion": "alpine3.15", "tags": { - "$(sdk|6.0|product-version)-alpine3.15-arm32v7": {}, + "$(sdk|6.0|product-version)-1-alpine3.15-arm32v7": {}, "6.0-alpine3.15-arm32v7": {} }, "variant": "v7" @@ -4616,7 +4616,7 @@ "os": "linux", "osVersion": "alpine3.15", "tags": { - "$(sdk|6.0|product-version)-alpine3.15-arm64v8": {}, + "$(sdk|6.0|product-version)-1-alpine3.15-arm64v8": {}, "6.0-alpine3.15-arm64v8": {} }, "variant": "v8" @@ -4626,7 +4626,7 @@ { "productVersion": "$(sdk|6.0|product-version)", "sharedTags": { - "$(sdk|6.0|product-version)-alpine3.16": {}, + "$(sdk|6.0|product-version)-1-alpine3.16": {}, "6.0-alpine3.16": {}, "6.0-alpine": {} }, @@ -4640,7 +4640,7 @@ "os": "linux", "osVersion": "alpine3.16", "tags": { - "$(sdk|6.0|product-version)-alpine3.16-amd64": {}, + "$(sdk|6.0|product-version)-1-alpine3.16-amd64": {}, "6.0-alpine3.16-amd64": {}, "6.0-alpine-amd64": {} } @@ -4655,7 +4655,7 @@ "os": "linux", "osVersion": "alpine3.16", "tags": { - "$(sdk|6.0|product-version)-alpine3.16-arm32v7": {}, + "$(sdk|6.0|product-version)-1-alpine3.16-arm32v7": {}, "6.0-alpine3.16-arm32v7": {}, "6.0-alpine-arm32v7": {} }, @@ -4671,7 +4671,7 @@ "os": "linux", "osVersion": "alpine3.16", "tags": { - "$(sdk|6.0|product-version)-alpine3.16-arm64v8": {}, + "$(sdk|6.0|product-version)-1-alpine3.16-arm64v8": {}, "6.0-alpine3.16-arm64v8": {}, "6.0-alpine-arm64v8": {} }, @@ -4682,7 +4682,7 @@ { "productVersion": "$(sdk|6.0|product-version)", "sharedTags": { - "$(sdk|6.0|product-version)-focal": {}, + "$(sdk|6.0|product-version)-1-focal": {}, "6.0-focal": {} }, "platforms": [ @@ -4695,7 +4695,7 @@ "os": "linux", "osVersion": "focal", "tags": { - "$(sdk|6.0|product-version)-focal-amd64": {}, + "$(sdk|6.0|product-version)-1-focal-amd64": {}, "6.0-focal-amd64": {} } }, @@ -4709,7 +4709,7 @@ "os": "linux", "osVersion": "focal", "tags": { - "$(sdk|6.0|product-version)-focal-arm32v7": {}, + "$(sdk|6.0|product-version)-1-focal-arm32v7": {}, "6.0-focal-arm32v7": {} }, "variant": "v7" @@ -4724,7 +4724,7 @@ "os": "linux", "osVersion": "focal", "tags": { - "$(sdk|6.0|product-version)-focal-arm64v8": {}, + "$(sdk|6.0|product-version)-1-focal-arm64v8": {}, "6.0-focal-arm64v8": {} }, "variant": "v8" @@ -4734,7 +4734,7 @@ { "productVersion": "$(sdk|6.0|product-version)", "sharedTags": { - "$(sdk|6.0|product-version)-jammy": {}, + "$(sdk|6.0|product-version)-1-jammy": {}, "6.0-jammy": {} }, "platforms": [ @@ -4747,7 +4747,7 @@ "os": "linux", "osVersion": "jammy", "tags": { - "$(sdk|6.0|product-version)-jammy-amd64": {}, + "$(sdk|6.0|product-version)-1-jammy-amd64": {}, "6.0-jammy-amd64": {} } }, @@ -4761,7 +4761,7 @@ "os": "linux", "osVersion": "jammy", "tags": { - "$(sdk|6.0|product-version)-jammy-arm32v7": {}, + "$(sdk|6.0|product-version)-1-jammy-arm32v7": {}, "6.0-jammy-arm32v7": {} }, "variant": "v7" @@ -4776,7 +4776,7 @@ "os": "linux", "osVersion": "jammy", "tags": { - "$(sdk|6.0|product-version)-jammy-arm64v8": {}, + "$(sdk|6.0|product-version)-1-jammy-arm64v8": {}, "6.0-jammy-arm64v8": {} }, "variant": "v8" @@ -4786,7 +4786,7 @@ { "productVersion": "$(sdk|6.0|product-version)", "sharedTags": { - "$(sdk|6.0|product-version)-cbl-mariner1.0": { + "$(sdk|6.0|product-version)-1-cbl-mariner1.0": { "docType": "Undocumented" }, "6.0-cbl-mariner1.0": { @@ -4803,7 +4803,7 @@ "os": "linux", "osVersion": "cbl-mariner1.0", "tags": { - "$(sdk|6.0|product-version)-cbl-mariner1.0-amd64": { + "$(sdk|6.0|product-version)-1-cbl-mariner1.0-amd64": { "docType": "Undocumented" }, "6.0-cbl-mariner1.0-amd64": { @@ -4816,7 +4816,7 @@ { "productVersion": "$(sdk|6.0|product-version)", "sharedTags": { - "$(sdk|6.0|product-version)-cbl-mariner2.0": { + "$(sdk|6.0|product-version)-1-cbl-mariner2.0": { "docType": "Undocumented" }, "6.0-cbl-mariner2.0": { @@ -4836,7 +4836,7 @@ "os": "linux", "osVersion": "cbl-mariner2.0", "tags": { - "$(sdk|6.0|product-version)-cbl-mariner2.0-amd64": { + "$(sdk|6.0|product-version)-1-cbl-mariner2.0-amd64": { "docType": "Undocumented" }, "6.0-cbl-mariner2.0-amd64": { @@ -4857,7 +4857,7 @@ "os": "linux", "osVersion": "cbl-mariner2.0", "tags": { - "$(sdk|6.0|product-version)-cbl-mariner2.0-arm64v8": { + "$(sdk|6.0|product-version)-1-cbl-mariner2.0-arm64v8": { "docType": "Undocumented" }, "6.0-cbl-mariner2.0-arm64v8": { diff --git a/src/monitor/6.1/alpine/amd64/Dockerfile b/src/monitor/6.1/alpine/amd64/Dockerfile index 1c1736f9e7..1f88903027 100644 --- a/src/monitor/6.1/alpine/amd64/Dockerfile +++ b/src/monitor/6.1/alpine/amd64/Dockerfile @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk # Installer image -FROM $SDK_REPO:6.0.400-alpine3.16-amd64 AS installer +FROM $SDK_REPO:6.0.400-1-alpine3.16-amd64 AS installer # Install .NET Monitor ENV DOTNET_MONITOR_VERSION=6.1.4 diff --git a/src/monitor/6.1/cbl-mariner/amd64/Dockerfile b/src/monitor/6.1/cbl-mariner/amd64/Dockerfile index 7342d02505..5e4a250010 100644 --- a/src/monitor/6.1/cbl-mariner/amd64/Dockerfile +++ b/src/monitor/6.1/cbl-mariner/amd64/Dockerfile @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk # Installer image -FROM $SDK_REPO:6.0.400-cbl-mariner2.0-amd64 AS installer +FROM $SDK_REPO:6.0.400-1-cbl-mariner2.0-amd64 AS installer # Install .NET Monitor ENV DOTNET_MONITOR_VERSION=6.1.4 diff --git a/src/monitor/6.2/alpine/amd64/Dockerfile b/src/monitor/6.2/alpine/amd64/Dockerfile index 7fe17e46af..46cbaa1694 100644 --- a/src/monitor/6.2/alpine/amd64/Dockerfile +++ b/src/monitor/6.2/alpine/amd64/Dockerfile @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk # Installer image -FROM $SDK_REPO:6.0.400-alpine3.16-amd64 AS installer +FROM $SDK_REPO:6.0.400-1-alpine3.16-amd64 AS installer # Install .NET Monitor ENV DOTNET_MONITOR_VERSION=6.2.2 diff --git a/src/monitor/6.2/alpine/arm64v8/Dockerfile b/src/monitor/6.2/alpine/arm64v8/Dockerfile index 6d4226f997..d9facfec9a 100644 --- a/src/monitor/6.2/alpine/arm64v8/Dockerfile +++ b/src/monitor/6.2/alpine/arm64v8/Dockerfile @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk # Installer image -FROM $SDK_REPO:6.0.400-alpine3.16-arm64v8 AS installer +FROM $SDK_REPO:6.0.400-1-alpine3.16-arm64v8 AS installer # Install .NET Monitor ENV DOTNET_MONITOR_VERSION=6.2.2 diff --git a/src/monitor/6.2/cbl-mariner-distroless/amd64/Dockerfile b/src/monitor/6.2/cbl-mariner-distroless/amd64/Dockerfile index 2e0df716c9..d8bf8717ee 100644 --- a/src/monitor/6.2/cbl-mariner-distroless/amd64/Dockerfile +++ b/src/monitor/6.2/cbl-mariner-distroless/amd64/Dockerfile @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk # Installer image -FROM $SDK_REPO:6.0.400-cbl-mariner2.0-amd64 AS installer +FROM $SDK_REPO:6.0.400-1-cbl-mariner2.0-amd64 AS installer # Install .NET Monitor ENV DOTNET_MONITOR_VERSION=6.2.2 diff --git a/src/monitor/6.2/cbl-mariner-distroless/arm64v8/Dockerfile b/src/monitor/6.2/cbl-mariner-distroless/arm64v8/Dockerfile index b1afc1acf2..7b02a70edf 100644 --- a/src/monitor/6.2/cbl-mariner-distroless/arm64v8/Dockerfile +++ b/src/monitor/6.2/cbl-mariner-distroless/arm64v8/Dockerfile @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk # Installer image -FROM $SDK_REPO:6.0.400-cbl-mariner2.0-arm64v8 AS installer +FROM $SDK_REPO:6.0.400-1-cbl-mariner2.0-arm64v8 AS installer # Install .NET Monitor ENV DOTNET_MONITOR_VERSION=6.2.2 diff --git a/src/monitor/6.2/cbl-mariner/amd64/Dockerfile b/src/monitor/6.2/cbl-mariner/amd64/Dockerfile index fcd38f8a4f..38b925ae9c 100644 --- a/src/monitor/6.2/cbl-mariner/amd64/Dockerfile +++ b/src/monitor/6.2/cbl-mariner/amd64/Dockerfile @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk # Installer image -FROM $SDK_REPO:6.0.400-cbl-mariner2.0-amd64 AS installer +FROM $SDK_REPO:6.0.400-1-cbl-mariner2.0-amd64 AS installer # Install .NET Monitor ENV DOTNET_MONITOR_VERSION=6.2.2 diff --git a/src/monitor/6.2/cbl-mariner/arm64v8/Dockerfile b/src/monitor/6.2/cbl-mariner/arm64v8/Dockerfile index ece8c8f13e..43b4a705f1 100644 --- a/src/monitor/6.2/cbl-mariner/arm64v8/Dockerfile +++ b/src/monitor/6.2/cbl-mariner/arm64v8/Dockerfile @@ -2,7 +2,7 @@ ARG ASPNET_REPO=mcr.microsoft.com/dotnet/aspnet ARG SDK_REPO=mcr.microsoft.com/dotnet/sdk # Installer image -FROM $SDK_REPO:6.0.400-cbl-mariner2.0-arm64v8 AS installer +FROM $SDK_REPO:6.0.400-1-cbl-mariner2.0-arm64v8 AS installer # Install .NET Monitor ENV DOTNET_MONITOR_VERSION=6.2.2 diff --git a/src/sdk/6.0/alpine3.15/amd64/Dockerfile b/src/sdk/6.0/alpine3.15/amd64/Dockerfile index 5935be2b21..04cff11268 100644 --- a/src/sdk/6.0/alpine3.15/amd64/Dockerfile +++ b/src/sdk/6.0/alpine3.15/amd64/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Disable the invariant mode (set in base image) diff --git a/src/sdk/6.0/alpine3.15/arm32v7/Dockerfile b/src/sdk/6.0/alpine3.15/arm32v7/Dockerfile index 57582853ba..4aaca72d81 100644 --- a/src/sdk/6.0/alpine3.15/arm32v7/Dockerfile +++ b/src/sdk/6.0/alpine3.15/arm32v7/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Disable the invariant mode (set in base image) diff --git a/src/sdk/6.0/alpine3.15/arm64v8/Dockerfile b/src/sdk/6.0/alpine3.15/arm64v8/Dockerfile index cd23f21bd3..01c177c5e8 100644 --- a/src/sdk/6.0/alpine3.15/arm64v8/Dockerfile +++ b/src/sdk/6.0/alpine3.15/arm64v8/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Disable the invariant mode (set in base image) diff --git a/src/sdk/6.0/alpine3.16/amd64/Dockerfile b/src/sdk/6.0/alpine3.16/amd64/Dockerfile index a3539e75a9..257f500cd4 100644 --- a/src/sdk/6.0/alpine3.16/amd64/Dockerfile +++ b/src/sdk/6.0/alpine3.16/amd64/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Disable the invariant mode (set in base image) diff --git a/src/sdk/6.0/alpine3.16/arm32v7/Dockerfile b/src/sdk/6.0/alpine3.16/arm32v7/Dockerfile index 8423a03b51..9ebd8347e1 100644 --- a/src/sdk/6.0/alpine3.16/arm32v7/Dockerfile +++ b/src/sdk/6.0/alpine3.16/arm32v7/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Disable the invariant mode (set in base image) diff --git a/src/sdk/6.0/alpine3.16/arm64v8/Dockerfile b/src/sdk/6.0/alpine3.16/arm64v8/Dockerfile index c7a268c63e..0dfe0f1872 100644 --- a/src/sdk/6.0/alpine3.16/arm64v8/Dockerfile +++ b/src/sdk/6.0/alpine3.16/arm64v8/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Disable the invariant mode (set in base image) diff --git a/src/sdk/6.0/bullseye-slim/amd64/Dockerfile b/src/sdk/6.0/bullseye-slim/amd64/Dockerfile index 939f473177..c4baecf856 100644 --- a/src/sdk/6.0/bullseye-slim/amd64/Dockerfile +++ b/src/sdk/6.0/bullseye-slim/amd64/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile b/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile index b2b7c40543..d62e791c29 100644 --- a/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile +++ b/src/sdk/6.0/bullseye-slim/arm32v7/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile b/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile index 0f7272b882..b32b1946b6 100644 --- a/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile +++ b/src/sdk/6.0/bullseye-slim/arm64v8/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/6.0/cbl-mariner1.0/amd64/Dockerfile b/src/sdk/6.0/cbl-mariner1.0/amd64/Dockerfile index 706e0e2599..33ba6b371c 100644 --- a/src/sdk/6.0/cbl-mariner1.0/amd64/Dockerfile +++ b/src/sdk/6.0/cbl-mariner1.0/amd64/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/6.0/cbl-mariner2.0/amd64/Dockerfile b/src/sdk/6.0/cbl-mariner2.0/amd64/Dockerfile index 6cb5193139..2f9275b48a 100644 --- a/src/sdk/6.0/cbl-mariner2.0/amd64/Dockerfile +++ b/src/sdk/6.0/cbl-mariner2.0/amd64/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/6.0/cbl-mariner2.0/arm64v8/Dockerfile b/src/sdk/6.0/cbl-mariner2.0/arm64v8/Dockerfile index 784de2bef6..562453d71f 100644 --- a/src/sdk/6.0/cbl-mariner2.0/arm64v8/Dockerfile +++ b/src/sdk/6.0/cbl-mariner2.0/arm64v8/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/6.0/focal/amd64/Dockerfile b/src/sdk/6.0/focal/amd64/Dockerfile index ff4d016496..7839616584 100644 --- a/src/sdk/6.0/focal/amd64/Dockerfile +++ b/src/sdk/6.0/focal/amd64/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/6.0/focal/arm32v7/Dockerfile b/src/sdk/6.0/focal/arm32v7/Dockerfile index 6cbf8c93d3..c92eb707ef 100644 --- a/src/sdk/6.0/focal/arm32v7/Dockerfile +++ b/src/sdk/6.0/focal/arm32v7/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/6.0/focal/arm64v8/Dockerfile b/src/sdk/6.0/focal/arm64v8/Dockerfile index 6e40dfc9f7..ad8b42c220 100644 --- a/src/sdk/6.0/focal/arm64v8/Dockerfile +++ b/src/sdk/6.0/focal/arm64v8/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/6.0/jammy/amd64/Dockerfile b/src/sdk/6.0/jammy/amd64/Dockerfile index a4e1f912be..3a2ea55966 100644 --- a/src/sdk/6.0/jammy/amd64/Dockerfile +++ b/src/sdk/6.0/jammy/amd64/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/6.0/jammy/arm32v7/Dockerfile b/src/sdk/6.0/jammy/arm32v7/Dockerfile index 45387b36f1..3147ed8400 100644 --- a/src/sdk/6.0/jammy/arm32v7/Dockerfile +++ b/src/sdk/6.0/jammy/arm32v7/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/src/sdk/6.0/jammy/arm64v8/Dockerfile b/src/sdk/6.0/jammy/arm64v8/Dockerfile index dc4989b4a9..0f6589f87e 100644 --- a/src/sdk/6.0/jammy/arm64v8/Dockerfile +++ b/src/sdk/6.0/jammy/arm64v8/Dockerfile @@ -8,8 +8,6 @@ ENV \ DOTNET_GENERATE_ASPNET_CERTIFICATE=false \ # Do not show first run text DOTNET_NOLOGO=true \ - # Enable validation for signed NuGet packages - DOTNET_NUGET_SIGNATURE_VERIFICATION=true \ # SDK version DOTNET_SDK_VERSION=6.0.400 \ # Enable correct mode for dotnet watch (only mode supported in a container) diff --git a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs index 64b44f3989..c0f1ebf475 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/SdkImageTests.cs @@ -89,11 +89,6 @@ public void VerifyEnvironmentVariables(ProductImageData imageData) variables.Add(RuntimeImageTests.GetRuntimeVersionVariableInfo(imageData, DockerHelper)); } - if (imageData.Version.Major == 6 && DockerHelper.IsLinuxContainerModeEnabled) - { - variables.Add(new EnvironmentVariableInfo("DOTNET_NUGET_SIGNATURE_VERIFICATION", "true")); - } - if (imageData.Version.Major >= 6) { variables.Add(new EnvironmentVariableInfo("DOTNET_NOLOGO", "true"));