From bed6b040ec91b90b92ca108b4d37a54822da4d42 Mon Sep 17 00:00:00 2001 From: dotnet-docker-bot <60522487+dotnet-docker-bot@users.noreply.github.com> Date: Tue, 22 Oct 2024 13:22:50 -0700 Subject: [PATCH 1/5] Update common Docker engineering infrastructure with latest --- eng/common/Install-DotNetSdk.ps1 | 2 +- .../templates/stages/build-test-publish-repo.yml | 9 +++++++++ .../steps/common-init-for-matrix-and-build.yml | 12 ++++++++++++ eng/common/templates/variables/docker-images.yml | 2 +- .../variables/dotnet/build-test-publish.yml | 2 +- 5 files changed, 24 insertions(+), 3 deletions(-) diff --git a/eng/common/Install-DotNetSdk.ps1 b/eng/common/Install-DotNetSdk.ps1 index ad675848fc..1ba23b6c75 100644 --- a/eng/common/Install-DotNetSdk.ps1 +++ b/eng/common/Install-DotNetSdk.ps1 @@ -54,6 +54,6 @@ else { } # See https://github.com/NuGet/NuGet.Client/pull/4259 -$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "3,1000" +$Env:NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY = "6,1500" if ($InstallFailed) { throw "Failed to install the .NET Core SDK" } diff --git a/eng/common/templates/stages/build-test-publish-repo.yml b/eng/common/templates/stages/build-test-publish-repo.yml index 0a5b9ef35e..e8309beda4 100644 --- a/eng/common/templates/stages/build-test-publish-repo.yml +++ b/eng/common/templates/stages/build-test-publish-repo.yml @@ -91,6 +91,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} - template: /eng/common/templates/jobs/build-images.yml@self parameters: name: Linux_amd64 @@ -104,6 +105,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} @@ -122,6 +124,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} @@ -140,6 +143,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} @@ -158,6 +162,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} @@ -176,6 +181,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} @@ -194,12 +200,14 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} publicProjectName: ${{ parameters.publicProjectName }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} - template: /eng/common/templates/jobs/build-images.yml@self parameters: name: WindowsLtsc2016_amd64 @@ -213,6 +221,7 @@ stages: noCache: ${{ parameters.noCache }} internalVersionsRepoRef: ${{ parameters.internalVersionsRepoRef }} publicVersionsRepoRef: ${{ parameters.publicVersionsRepoRef }} + isInternalServicingValidation: ${{ parameters.isInternalServicingValidation }} customInitSteps: ${{ parameters.customBuildInitSteps }} noCache: ${{ parameters.noCache }} internalProjectName: ${{ parameters.internalProjectName }} diff --git a/eng/common/templates/steps/common-init-for-matrix-and-build.yml b/eng/common/templates/steps/common-init-for-matrix-and-build.yml index 2f12a54d7c..ce34eaf262 100644 --- a/eng/common/templates/steps/common-init-for-matrix-and-build.yml +++ b/eng/common/templates/steps/common-init-for-matrix-and-build.yml @@ -3,6 +3,7 @@ parameters: internalVersionsRepoRef: null publicVersionsRepoRef: null versionsRepoPath: versions + isInternalServicingValidation: false steps: - checkout: self @@ -60,3 +61,14 @@ steps: echo "##vso[task.setvariable variable=versionsBasePath]$versionsBasePath" echo "##vso[task.setvariable variable=pipelineDisabledCache]$pipelineDisabledCache" displayName: Set Common Variables for Matrix and Build + +- ${{ if eq(parameters.noCache, false) }}: + # Special logic is needed to copy the tsaoptions.json file to a well known location for the 1ES PT. + # This template has multiple checkouts and AzDO doesn't have support for dynamically determining the + # default repo path therefore the 1es-official logic can't calculate the repo's tsa config file path. + - task: CopyFiles@2 + displayName: Copy TSA Config + inputs: + SourceFolder: '$(Build.Repository.LocalPath)/$(buildRepoName)' + Contents: '.config/tsaoptions.json' + TargetFolder: '$(Build.SourcesDirectory)' diff --git a/eng/common/templates/variables/docker-images.yml b/eng/common/templates/variables/docker-images.yml index 69fd91ec7c..58ce59e0ad 100644 --- a/eng/common/templates/variables/docker-images.yml +++ b/eng/common/templates/variables/docker-images.yml @@ -1,5 +1,5 @@ variables: - imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2555712 + imageNames.imageBuilderName: mcr.microsoft.com/dotnet-buildtools/image-builder:2566544 imageNames.imageBuilder: $(imageNames.imageBuilderName) imageNames.imageBuilder.withrepo: imagebuilder-withrepo:$(Build.BuildId)-$(System.JobId) imageNames.testRunner: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner2.0-docker-testrunner diff --git a/eng/common/templates/variables/dotnet/build-test-publish.yml b/eng/common/templates/variables/dotnet/build-test-publish.yml index 51e5dde3cf..ce88f4f2e5 100644 --- a/eng/common/templates/variables/dotnet/build-test-publish.yml +++ b/eng/common/templates/variables/dotnet/build-test-publish.yml @@ -12,7 +12,7 @@ variables: - name: testResultsDirectory value: tests/Microsoft.DotNet.Docker.Tests/TestResults/ - name: officialRepoPrefixes - value: public/,internal/private/ + value: public/,internal/private/,unlisted/ - name: mcrDocsRepoInfo.accessToken value: $(BotAccount-dotnet-docker-bot-PAT) From a8f01ef45a3faeb14634df10f6461bc489a9900f Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 24 Oct 2024 09:58:38 -0700 Subject: [PATCH 2/5] Update tags-metadata-templates --- .../aspire-dashboard-tags.yml | 2 -- .../monitor-tags.yml | 17 ++--------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml b/eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml index dbc4ffda99..6b7cc96954 100644 --- a/eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml +++ b/eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml @@ -1,5 +1,3 @@ $(McrTagsYmlRepo:aspire-dashboard) $(McrTagsYmlTagGroup:8.2) -$(McrTagsYmlTagGroup:8) $(McrTagsYmlTagGroup:9.0-preview) -$(McrTagsYmlTagGroup:9-preview) diff --git a/eng/mcr-tags-metadata-templates/monitor-tags.yml b/eng/mcr-tags-metadata-templates/monitor-tags.yml index c3e950fd11..cf2d1b4404 100644 --- a/eng/mcr-tags-metadata-templates/monitor-tags.yml +++ b/eng/mcr-tags-metadata-templates/monitor-tags.yml @@ -1,22 +1,9 @@ $(McrTagsYmlRepo:monitor) $(McrTagsYmlTagGroup:9.0) -$(McrTagsYmlTagGroup:9) -$(McrTagsYmlTagGroup:8.1-preview-ubuntu-chiseled-amd64) - customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.1-preview-ubuntu-chiseled-arm64v8) - customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-distroless-amd64) - customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-distroless-arm64v8) - customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.0.5-ubuntu-chiseled) -$(McrTagsYmlTagGroup:8.0.5-cbl-mariner-distroless) +$(McrTagsYmlTagGroup:8.1-preview-ubuntu-chiseled|.NET Monitor Preview Tags) +$(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-distroless|.NET Monitor Preview Tags) $(McrTagsYmlTagGroup:8.0-ubuntu-chiseled) $(McrTagsYmlTagGroup:8.0-cbl-mariner-distroless) -$(McrTagsYmlTagGroup:6.3.9-alpine) -$(McrTagsYmlTagGroup:6.3.9-ubuntu-chiseled) -$(McrTagsYmlTagGroup:6.3.9-cbl-mariner) -$(McrTagsYmlTagGroup:6.3.9-cbl-mariner-distroless) $(McrTagsYmlTagGroup:6.3-alpine) $(McrTagsYmlTagGroup:6.3-ubuntu-chiseled) $(McrTagsYmlTagGroup:6.3-cbl-mariner) From 54b35cbc0db3a7aadfd76405d0bd9eb148547c7e Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 24 Oct 2024 10:02:00 -0700 Subject: [PATCH 3/5] Update aspnet tags templates --- README.aspnet.md | 2 +- .../aspnet-tags.yml | 158 +++++------------- 2 files changed, 46 insertions(+), 114 deletions(-) diff --git a/README.aspnet.md b/README.aspnet.md index 0c471ed4be..4dfd859b95 100644 --- a/README.aspnet.md +++ b/README.aspnet.md @@ -122,9 +122,9 @@ Tags | Dockerfile | OS Version 6.0.35-jammy-amd64, 6.0-jammy-amd64, 6.0.35-jammy, 6.0-jammy | [Dockerfile](src/aspnet/6.0/jammy/amd64/Dockerfile) | Ubuntu 22.04 6.0.35-jammy-chiseled-amd64, 6.0-jammy-chiseled-amd64, 6.0.35-jammy-chiseled, 6.0-jammy-chiseled | [Dockerfile](src/aspnet/6.0/jammy-chiseled/amd64/Dockerfile) | Ubuntu 22.04 6.0.35-jammy-chiseled-extra-amd64, 6.0-jammy-chiseled-extra-amd64, 6.0.35-jammy-chiseled-extra, 6.0-jammy-chiseled-extra | [Dockerfile](src/aspnet/6.0/jammy-chiseled-extra/amd64/Dockerfile) | Ubuntu 22.04 +6.0.35-focal-amd64, 6.0-focal-amd64, 6.0.35-focal, 6.0-focal | [Dockerfile](src/aspnet/6.0/focal/amd64/Dockerfile) | Ubuntu 20.04 6.0.35-cbl-mariner2.0-amd64, 6.0-cbl-mariner2.0-amd64, 6.0.35-cbl-mariner2.0, 6.0-cbl-mariner2.0 | [Dockerfile](src/aspnet/6.0/cbl-mariner2.0/amd64/Dockerfile) | CBL-Mariner 2.0 6.0.35-cbl-mariner2.0-distroless-amd64, 6.0-cbl-mariner2.0-distroless-amd64, 6.0.35-cbl-mariner2.0-distroless, 6.0-cbl-mariner2.0-distroless | [Dockerfile](src/aspnet/6.0/cbl-mariner2.0-distroless/amd64/Dockerfile) | CBL-Mariner 2.0 -6.0.35-focal-amd64, 6.0-focal-amd64, 6.0.35-focal, 6.0-focal | [Dockerfile](src/aspnet/6.0/focal/amd64/Dockerfile) | Ubuntu 20.04 ### Linux arm64 Tags diff --git a/eng/mcr-tags-metadata-templates/aspnet-tags.yml b/eng/mcr-tags-metadata-templates/aspnet-tags.yml index ec52012522..122b7529e9 100644 --- a/eng/mcr-tags-metadata-templates/aspnet-tags.yml +++ b/eng/mcr-tags-metadata-templates/aspnet-tags.yml @@ -1,117 +1,49 @@ $(McrTagsYmlRepo:aspnet) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:9.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:9.0-alpine3.20-composite-amd64) -$(McrTagsYmlTagGroup:9.0-noble-amd64) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-amd64) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-composite-amd64) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-composite-extra-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-composite-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-composite-extra-amd64) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:8.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:8.0-alpine3.20-composite-amd64) -$(McrTagsYmlTagGroup:8.0-noble-amd64) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-amd64) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-composite-amd64) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-composite-extra-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-extra-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-composite-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-composite-extra-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-composite-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-composite-extra-amd64) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-amd64) -$(McrTagsYmlTagGroup:6.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:6.0-jammy-amd64) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-amd64) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-amd64) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-distroless-amd64) -$(McrTagsYmlTagGroup:6.0-focal-amd64) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:9.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:9.0-alpine3.20-composite-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-composite-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-composite-extra-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-composite-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-composite-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:8.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:8.0-alpine3.20-composite-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-composite-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-composite-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-composite-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-composite-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-composite-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-composite-extra-arm64v8) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-arm64v8) -$(McrTagsYmlTagGroup:6.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:6.0-jammy-arm64v8) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-arm64v8) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:6.0-focal-arm64v8) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-arm64v8) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:9.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:9.0-alpine3.20-composite-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-composite-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-composite-extra-arm32v7) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:8.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:8.0-alpine3.20-composite-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-extra-arm32v7) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-arm32v7) -$(McrTagsYmlTagGroup:6.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:6.0-jammy-arm32v7) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-arm32v7) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra-arm32v7) -$(McrTagsYmlTagGroup:6.0-focal-arm32v7) +$(McrTagsYmlTagGroup:9.0-bookworm-slim) +$(McrTagsYmlTagGroup:9.0-alpine3.20) +$(McrTagsYmlTagGroup:9.0-alpine3.20-composite) +$(McrTagsYmlTagGroup:9.0-noble) +$(McrTagsYmlTagGroup:9.0-noble-chiseled) +$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra) +$(McrTagsYmlTagGroup:9.0-noble-chiseled-composite) +$(McrTagsYmlTagGroup:9.0-noble-chiseled-composite-extra) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-composite) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-composite-extra) +$(McrTagsYmlTagGroup:8.0-bookworm-slim) +$(McrTagsYmlTagGroup:8.0-alpine3.20) +$(McrTagsYmlTagGroup:8.0-alpine3.20-composite) +$(McrTagsYmlTagGroup:8.0-noble) +$(McrTagsYmlTagGroup:8.0-noble-chiseled) +$(McrTagsYmlTagGroup:8.0-noble-chiseled-extra) +$(McrTagsYmlTagGroup:8.0-noble-chiseled-composite) +$(McrTagsYmlTagGroup:8.0-noble-chiseled-composite-extra) +$(McrTagsYmlTagGroup:8.0-jammy) +$(McrTagsYmlTagGroup:8.0-jammy-chiseled) +$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra) +$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite) +$(McrTagsYmlTagGroup:8.0-jammy-chiseled-composite-extra) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-composite) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-composite-extra) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-composite) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-composite-extra) +$(McrTagsYmlTagGroup:6.0-bookworm-slim) +$(McrTagsYmlTagGroup:6.0-bullseye-slim) +$(McrTagsYmlTagGroup:6.0-alpine3.20) +$(McrTagsYmlTagGroup:6.0-jammy) +$(McrTagsYmlTagGroup:6.0-jammy-chiseled) +$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra) +$(McrTagsYmlTagGroup:6.0-focal) +$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0) +$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-distroless) $(McrTagsYmlTagGroup:9.0-nanoserver-ltsc2022) $(McrTagsYmlTagGroup:9.0-windowsservercore-ltsc2022) $(McrTagsYmlTagGroup:8.0-nanoserver-ltsc2022) From b2cea4ec4b85d7660c1be62fd0e67ec2fb6876e7 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 24 Oct 2024 10:03:49 -0700 Subject: [PATCH 4/5] Update monitor-base tags templates --- .../monitor-base-tags.yml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/eng/mcr-tags-metadata-templates/monitor-base-tags.yml b/eng/mcr-tags-metadata-templates/monitor-base-tags.yml index 7448c23a04..7740d67c37 100644 --- a/eng/mcr-tags-metadata-templates/monitor-base-tags.yml +++ b/eng/mcr-tags-metadata-templates/monitor-base-tags.yml @@ -1,15 +1,6 @@ $(McrTagsYmlRepo:monitor-base) -$(McrTagsYmlTagGroup:9.0-amd64) -$(McrTagsYmlTagGroup:9.0-arm64v8) -$(McrTagsYmlTagGroup:8.1-preview-ubuntu-chiseled-amd64) - customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.1-preview-ubuntu-chiseled-arm64v8) - customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-distroless-amd64) - customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-distroless-arm64v8) - customSubTableTitle: .NET Monitor Preview Tags -$(McrTagsYmlTagGroup:8.0-ubuntu-chiseled-amd64) -$(McrTagsYmlTagGroup:8.0-ubuntu-chiseled-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner-distroless-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner-distroless-arm64v8) +$(McrTagsYmlTagGroup:9.0) +$(McrTagsYmlTagGroup:8.1-preview-ubuntu-chiseled|.NET Monitor Preview Tags) +$(McrTagsYmlTagGroup:8.1-preview-cbl-mariner-distroless|.NET Monitor Preview Tags) +$(McrTagsYmlTagGroup:8.0-ubuntu-chiseled) +$(McrTagsYmlTagGroup:8.0-cbl-mariner-distroless) From 15580a77e7f7cb8e5693cfcc7cc0d121a296744b Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 24 Oct 2024 10:16:31 -0700 Subject: [PATCH 5/5] Simplify rest of tags templates --- README.samples.md | 26 ++-- .../runtime-deps-tags.yml | 146 +++++------------- .../runtime-tags.yml | 110 ++++--------- .../samples-tags.yml | 32 +--- eng/mcr-tags-metadata-templates/sdk-tags.yml | 83 +++------- 5 files changed, 117 insertions(+), 280 deletions(-) diff --git a/README.samples.md b/README.samples.md index 2227445e86..a888dd5fae 100644 --- a/README.samples.md +++ b/README.samples.md @@ -89,19 +89,6 @@ dotnetapp-chiseled-8.0-amd64, dotnetapp-chiseled-amd64, dotnetapp-chiseled-8.0, aspnetapp-8.0-alpine-amd64, aspnetapp-alpine-amd64, aspnetapp-8.0, aspnetapp | [Dockerfile](samples/8.0/aspnetapp/Dockerfile.alpine) | Alpine aspnetapp-chiseled-8.0-amd64, aspnetapp-chiseled-amd64, aspnetapp-chiseled-8.0, aspnetapp-chiseled | [Dockerfile](samples/8.0/aspnetapp/Dockerfile.chiseled) | Ubuntu -### Linux arm32 Tags - -Tags | Dockerfile | OS Version ------------| -------------| ------------- -dotnetapp-9.0-alpine-arm32v7, dotnetapp-9.0 | [Dockerfile](samples/dotnetapp/Dockerfile.alpine) | Alpine -dotnetapp-chiseled-9.0-arm32v7, dotnetapp-chiseled-9.0 | [Dockerfile](samples/dotnetapp/Dockerfile.chiseled) | Ubuntu -aspnetapp-9.0-alpine-arm32v7, aspnetapp-9.0 | [Dockerfile](samples/aspnetapp/Dockerfile.alpine) | Alpine -aspnetapp-chiseled-9.0-arm32v7, aspnetapp-chiseled-9.0 | [Dockerfile](samples/aspnetapp/Dockerfile.chiseled) | Ubuntu -dotnetapp-8.0-alpine-arm32v7, dotnetapp-alpine-arm32v7, dotnetapp-8.0, dotnetapp, latest | [Dockerfile](samples/8.0/dotnetapp/Dockerfile.alpine) | Alpine -dotnetapp-chiseled-8.0-arm32v7, dotnetapp-chiseled-arm32v7, dotnetapp-chiseled-8.0, dotnetapp-chiseled | [Dockerfile](samples/8.0/dotnetapp/Dockerfile.chiseled) | Ubuntu -aspnetapp-8.0-alpine-arm32v7, aspnetapp-alpine-arm32v7, aspnetapp-8.0, aspnetapp | [Dockerfile](samples/8.0/aspnetapp/Dockerfile.alpine) | Alpine -aspnetapp-chiseled-8.0-arm32v7, aspnetapp-chiseled-arm32v7, aspnetapp-chiseled-8.0, aspnetapp-chiseled | [Dockerfile](samples/8.0/aspnetapp/Dockerfile.chiseled) | Ubuntu - ### Linux arm64 Tags Tags | Dockerfile | OS Version @@ -115,6 +102,19 @@ dotnetapp-chiseled-8.0-arm64v8, dotnetapp-chiseled-arm64v8, dotnetapp-chiseled-8 aspnetapp-8.0-alpine-arm64v8, aspnetapp-alpine-arm64v8, aspnetapp-8.0, aspnetapp | [Dockerfile](samples/8.0/aspnetapp/Dockerfile.alpine) | Alpine aspnetapp-chiseled-8.0-arm64v8, aspnetapp-chiseled-arm64v8, aspnetapp-chiseled-8.0, aspnetapp-chiseled | [Dockerfile](samples/8.0/aspnetapp/Dockerfile.chiseled) | Ubuntu +### Linux arm32 Tags + +Tags | Dockerfile | OS Version +-----------| -------------| ------------- +dotnetapp-9.0-alpine-arm32v7, dotnetapp-9.0 | [Dockerfile](samples/dotnetapp/Dockerfile.alpine) | Alpine +dotnetapp-chiseled-9.0-arm32v7, dotnetapp-chiseled-9.0 | [Dockerfile](samples/dotnetapp/Dockerfile.chiseled) | Ubuntu +aspnetapp-9.0-alpine-arm32v7, aspnetapp-9.0 | [Dockerfile](samples/aspnetapp/Dockerfile.alpine) | Alpine +aspnetapp-chiseled-9.0-arm32v7, aspnetapp-chiseled-9.0 | [Dockerfile](samples/aspnetapp/Dockerfile.chiseled) | Ubuntu +dotnetapp-8.0-alpine-arm32v7, dotnetapp-alpine-arm32v7, dotnetapp-8.0, dotnetapp, latest | [Dockerfile](samples/8.0/dotnetapp/Dockerfile.alpine) | Alpine +dotnetapp-chiseled-8.0-arm32v7, dotnetapp-chiseled-arm32v7, dotnetapp-chiseled-8.0, dotnetapp-chiseled | [Dockerfile](samples/8.0/dotnetapp/Dockerfile.chiseled) | Ubuntu +aspnetapp-8.0-alpine-arm32v7, aspnetapp-alpine-arm32v7, aspnetapp-8.0, aspnetapp | [Dockerfile](samples/8.0/aspnetapp/Dockerfile.alpine) | Alpine +aspnetapp-chiseled-8.0-arm32v7, aspnetapp-chiseled-arm32v7, aspnetapp-chiseled-8.0, aspnetapp-chiseled | [Dockerfile](samples/8.0/aspnetapp/Dockerfile.chiseled) | Ubuntu + ### Nano Server 2022 amd64 Tags Tag | Dockerfile diff --git a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml index 650e8296c9..44331a3487 100644 --- a/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-deps-tags.yml @@ -1,106 +1,42 @@ $(McrTagsYmlRepo:runtime-deps) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:9.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:9.0-alpine3.20-aot-amd64) -$(McrTagsYmlTagGroup:9.0-alpine3.20-extra-amd64) -$(McrTagsYmlTagGroup:9.0-noble-amd64) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-amd64) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-aot-amd64) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-aot-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra-amd64) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:8.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:8.0-alpine3.20-aot-amd64) -$(McrTagsYmlTagGroup:8.0-alpine3.20-extra-amd64) -$(McrTagsYmlTagGroup:8.0-noble-amd64) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-amd64) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-aot-amd64) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-aot-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-aot-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-aot-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-amd64) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-amd64) -$(McrTagsYmlTagGroup:6.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:6.0-jammy-amd64) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-amd64) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-amd64) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-distroless-amd64) -$(McrTagsYmlTagGroup:6.0-focal-amd64) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:9.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:9.0-alpine3.20-aot-arm64v8) -$(McrTagsYmlTagGroup:9.0-alpine3.20-extra-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-aot-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-aot-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:8.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:8.0-alpine3.20-aot-arm64v8) -$(McrTagsYmlTagGroup:8.0-alpine3.20-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-aot-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-aot-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-aot-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-aot-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-arm64v8) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-arm64v8) -$(McrTagsYmlTagGroup:6.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:6.0-jammy-arm64v8) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-arm64v8) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-arm64v8) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:6.0-focal-arm64v8) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:9.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:9.0-alpine3.20-aot-arm32v7) -$(McrTagsYmlTagGroup:9.0-alpine3.20-extra-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-aot-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra-arm32v7) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:8.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:8.0-alpine3.20-aot-arm32v7) -$(McrTagsYmlTagGroup:8.0-alpine3.20-extra-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-aot-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm32v7) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-arm32v7) -$(McrTagsYmlTagGroup:6.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:6.0-jammy-arm32v7) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-arm32v7) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra-arm32v7) -$(McrTagsYmlTagGroup:6.0-focal-arm32v7) +$(McrTagsYmlTagGroup:9.0-bookworm-slim) +$(McrTagsYmlTagGroup:9.0-alpine3.20) +$(McrTagsYmlTagGroup:9.0-alpine3.20-aot) +$(McrTagsYmlTagGroup:9.0-alpine3.20-extra) +$(McrTagsYmlTagGroup:9.0-noble) +$(McrTagsYmlTagGroup:9.0-noble-chiseled) +$(McrTagsYmlTagGroup:9.0-noble-chiseled-aot) +$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-aot) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra) +$(McrTagsYmlTagGroup:8.0-bookworm-slim) +$(McrTagsYmlTagGroup:8.0-alpine3.20) +$(McrTagsYmlTagGroup:8.0-alpine3.20-aot) +$(McrTagsYmlTagGroup:8.0-alpine3.20-extra) +$(McrTagsYmlTagGroup:8.0-noble) +$(McrTagsYmlTagGroup:8.0-noble-chiseled) +$(McrTagsYmlTagGroup:8.0-noble-chiseled-aot) +$(McrTagsYmlTagGroup:8.0-noble-chiseled-extra) +$(McrTagsYmlTagGroup:8.0-jammy) +$(McrTagsYmlTagGroup:8.0-jammy-chiseled) +$(McrTagsYmlTagGroup:8.0-jammy-chiseled-aot) +$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-aot) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-aot) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra) +$(McrTagsYmlTagGroup:6.0-bookworm-slim) +$(McrTagsYmlTagGroup:6.0-bullseye-slim) +$(McrTagsYmlTagGroup:6.0-alpine3.20) +$(McrTagsYmlTagGroup:6.0-jammy) +$(McrTagsYmlTagGroup:6.0-jammy-chiseled) +$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra) +$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0) +$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-distroless) +$(McrTagsYmlTagGroup:6.0-focal) diff --git a/eng/mcr-tags-metadata-templates/runtime-tags.yml b/eng/mcr-tags-metadata-templates/runtime-tags.yml index 0c07841edb..f7ae7cab7d 100644 --- a/eng/mcr-tags-metadata-templates/runtime-tags.yml +++ b/eng/mcr-tags-metadata-templates/runtime-tags.yml @@ -1,83 +1,35 @@ $(McrTagsYmlRepo:runtime) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:9.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:9.0-noble-amd64) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-amd64) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra-amd64) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:8.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:8.0-noble-amd64) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-amd64) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-amd64) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-amd64) -$(McrTagsYmlTagGroup:6.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:6.0-jammy-amd64) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-amd64) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra-amd64) -$(McrTagsYmlTagGroup:6.0-focal-amd64) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-amd64) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-distroless-amd64) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:9.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:8.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra-arm64v8) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-arm64v8) -$(McrTagsYmlTagGroup:6.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:6.0-jammy-arm64v8) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-arm64v8) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra-arm64v8) -$(McrTagsYmlTagGroup:6.0-focal-arm64v8) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-arm64v8) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-distroless-arm64v8) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:9.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra-arm32v7) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:8.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra-arm32v7) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-arm32v7) -$(McrTagsYmlTagGroup:6.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:6.0-jammy-arm32v7) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-arm32v7) -$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra-arm32v7) -$(McrTagsYmlTagGroup:6.0-focal-arm32v7) +$(McrTagsYmlTagGroup:9.0-bookworm-slim) +$(McrTagsYmlTagGroup:9.0-alpine3.20) +$(McrTagsYmlTagGroup:9.0-noble) +$(McrTagsYmlTagGroup:9.0-noble-chiseled) +$(McrTagsYmlTagGroup:9.0-noble-chiseled-extra) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0-distroless-extra) +$(McrTagsYmlTagGroup:8.0-bookworm-slim) +$(McrTagsYmlTagGroup:8.0-alpine3.20) +$(McrTagsYmlTagGroup:8.0-noble) +$(McrTagsYmlTagGroup:8.0-noble-chiseled) +$(McrTagsYmlTagGroup:8.0-noble-chiseled-extra) +$(McrTagsYmlTagGroup:8.0-jammy) +$(McrTagsYmlTagGroup:8.0-jammy-chiseled) +$(McrTagsYmlTagGroup:8.0-jammy-chiseled-extra) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-distroless-extra) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-distroless-extra) +$(McrTagsYmlTagGroup:6.0-bookworm-slim) +$(McrTagsYmlTagGroup:6.0-bullseye-slim) +$(McrTagsYmlTagGroup:6.0-alpine3.20) +$(McrTagsYmlTagGroup:6.0-jammy) +$(McrTagsYmlTagGroup:6.0-jammy-chiseled) +$(McrTagsYmlTagGroup:6.0-jammy-chiseled-extra) +$(McrTagsYmlTagGroup:6.0-focal) +$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0) +$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-distroless) $(McrTagsYmlTagGroup:9.0-nanoserver-ltsc2022) $(McrTagsYmlTagGroup:9.0-windowsservercore-ltsc2022) $(McrTagsYmlTagGroup:8.0-nanoserver-ltsc2022) diff --git a/eng/mcr-tags-metadata-templates/samples-tags.yml b/eng/mcr-tags-metadata-templates/samples-tags.yml index 88067349df..fb591a531e 100644 --- a/eng/mcr-tags-metadata-templates/samples-tags.yml +++ b/eng/mcr-tags-metadata-templates/samples-tags.yml @@ -1,32 +1,16 @@ $(McrTagsYmlRepo:samples) -$(McrTagsYmlTagGroup:dotnetapp-9.0-alpine-amd64) -$(McrTagsYmlTagGroup:dotnetapp-chiseled-9.0-amd64) -$(McrTagsYmlTagGroup:aspnetapp-9.0-alpine-amd64) -$(McrTagsYmlTagGroup:aspnetapp-chiseled-9.0-amd64) -$(McrTagsYmlTagGroup:dotnetapp-9.0-alpine-arm32v7) -$(McrTagsYmlTagGroup:dotnetapp-chiseled-9.0-arm32v7) -$(McrTagsYmlTagGroup:aspnetapp-9.0-alpine-arm32v7) -$(McrTagsYmlTagGroup:aspnetapp-chiseled-9.0-arm32v7) -$(McrTagsYmlTagGroup:dotnetapp-9.0-alpine-arm64v8) -$(McrTagsYmlTagGroup:dotnetapp-chiseled-9.0-arm64v8) -$(McrTagsYmlTagGroup:aspnetapp-9.0-alpine-arm64v8) -$(McrTagsYmlTagGroup:aspnetapp-chiseled-9.0-arm64v8) +$(McrTagsYmlTagGroup:dotnetapp-9.0) +$(McrTagsYmlTagGroup:dotnetapp-chiseled-9.0) +$(McrTagsYmlTagGroup:aspnetapp-9.0) +$(McrTagsYmlTagGroup:aspnetapp-chiseled-9.0) $(McrTagsYmlTagGroup:dotnetapp-9.0-nanoserver-ltsc2022) $(McrTagsYmlTagGroup:aspnetapp-9.0-nanoserver-ltsc2022) $(McrTagsYmlTagGroup:dotnetapp-9.0-nanoserver-1809) $(McrTagsYmlTagGroup:aspnetapp-9.0-nanoserver-1809) -$(McrTagsYmlTagGroup:dotnetapp-alpine-amd64) -$(McrTagsYmlTagGroup:dotnetapp-chiseled-amd64) -$(McrTagsYmlTagGroup:aspnetapp-alpine-amd64) -$(McrTagsYmlTagGroup:aspnetapp-chiseled-amd64) -$(McrTagsYmlTagGroup:dotnetapp-alpine-arm32v7) -$(McrTagsYmlTagGroup:dotnetapp-chiseled-arm32v7) -$(McrTagsYmlTagGroup:aspnetapp-alpine-arm32v7) -$(McrTagsYmlTagGroup:aspnetapp-chiseled-arm32v7) -$(McrTagsYmlTagGroup:dotnetapp-alpine-arm64v8) -$(McrTagsYmlTagGroup:dotnetapp-chiseled-arm64v8) -$(McrTagsYmlTagGroup:aspnetapp-alpine-arm64v8) -$(McrTagsYmlTagGroup:aspnetapp-chiseled-arm64v8) +$(McrTagsYmlTagGroup:dotnetapp) +$(McrTagsYmlTagGroup:dotnetapp-chiseled) +$(McrTagsYmlTagGroup:aspnetapp) +$(McrTagsYmlTagGroup:aspnetapp-chiseled) $(McrTagsYmlTagGroup:dotnetapp-nanoserver-ltsc2022) $(McrTagsYmlTagGroup:aspnetapp-nanoserver-ltsc2022) $(McrTagsYmlTagGroup:dotnetapp-nanoserver-1809) diff --git a/eng/mcr-tags-metadata-templates/sdk-tags.yml b/eng/mcr-tags-metadata-templates/sdk-tags.yml index 21f9d7ec72..bf19bfe66b 100644 --- a/eng/mcr-tags-metadata-templates/sdk-tags.yml +++ b/eng/mcr-tags-metadata-templates/sdk-tags.yml @@ -1,63 +1,28 @@ $(McrTagsYmlRepo:sdk) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:9.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:9.0-alpine3.20-aot-amd64) -$(McrTagsYmlTagGroup:9.0-noble-amd64) -$(McrTagsYmlTagGroup:9.0-noble-aot-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-amd64) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-aot-amd64) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:8.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:8.0-alpine3.20-aot-amd64) -$(McrTagsYmlTagGroup:8.0-noble-amd64) -$(McrTagsYmlTagGroup:8.0-noble-aot-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-amd64) -$(McrTagsYmlTagGroup:8.0-jammy-aot-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-amd64) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-aot-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-amd64) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-aot-amd64) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-amd64) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-amd64) -$(McrTagsYmlTagGroup:6.0-alpine3.20-amd64) -$(McrTagsYmlTagGroup:6.0-jammy-amd64) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-amd64) -$(McrTagsYmlTagGroup:6.0-focal-amd64) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:9.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:9.0-alpine3.20-aot-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-arm64v8) -$(McrTagsYmlTagGroup:9.0-noble-aot-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-arm64v8) -$(McrTagsYmlTagGroup:9.0-azurelinux3.0-aot-arm64v8) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:8.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:8.0-alpine3.20-aot-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-arm64v8) -$(McrTagsYmlTagGroup:8.0-noble-aot-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-arm64v8) -$(McrTagsYmlTagGroup:8.0-jammy-aot-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-arm64v8) -$(McrTagsYmlTagGroup:8.0-azurelinux3.0-aot-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-arm64v8) -$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-aot-arm64v8) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-arm64v8) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-arm64v8) -$(McrTagsYmlTagGroup:6.0-alpine3.20-arm64v8) -$(McrTagsYmlTagGroup:6.0-jammy-arm64v8) -$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0-arm64v8) -$(McrTagsYmlTagGroup:6.0-focal-arm64v8) -$(McrTagsYmlTagGroup:9.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:9.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:9.0-noble-arm32v7) -$(McrTagsYmlTagGroup:8.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:8.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:8.0-jammy-arm32v7) -$(McrTagsYmlTagGroup:6.0-bookworm-slim-arm32v7) -$(McrTagsYmlTagGroup:6.0-bullseye-slim-arm32v7) -$(McrTagsYmlTagGroup:6.0-alpine3.20-arm32v7) -$(McrTagsYmlTagGroup:6.0-jammy-arm32v7) -$(McrTagsYmlTagGroup:6.0-focal-arm32v7) +$(McrTagsYmlTagGroup:9.0-bookworm-slim) +$(McrTagsYmlTagGroup:9.0-alpine3.20) +$(McrTagsYmlTagGroup:9.0-alpine3.20-aot) +$(McrTagsYmlTagGroup:9.0-noble) +$(McrTagsYmlTagGroup:9.0-noble-aot) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0) +$(McrTagsYmlTagGroup:9.0-azurelinux3.0-aot) +$(McrTagsYmlTagGroup:8.0-bookworm-slim) +$(McrTagsYmlTagGroup:8.0-alpine3.20) +$(McrTagsYmlTagGroup:8.0-alpine3.20-aot) +$(McrTagsYmlTagGroup:8.0-noble) +$(McrTagsYmlTagGroup:8.0-noble-aot) +$(McrTagsYmlTagGroup:8.0-jammy) +$(McrTagsYmlTagGroup:8.0-jammy-aot) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0) +$(McrTagsYmlTagGroup:8.0-azurelinux3.0-aot) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0) +$(McrTagsYmlTagGroup:8.0-cbl-mariner2.0-aot) +$(McrTagsYmlTagGroup:6.0-bookworm-slim) +$(McrTagsYmlTagGroup:6.0-bullseye-slim) +$(McrTagsYmlTagGroup:6.0-alpine3.20) +$(McrTagsYmlTagGroup:6.0-jammy) +$(McrTagsYmlTagGroup:6.0-cbl-mariner2.0) +$(McrTagsYmlTagGroup:6.0-focal) $(McrTagsYmlTagGroup:9.0-nanoserver-ltsc2022) $(McrTagsYmlTagGroup:9.0-windowsservercore-ltsc2022) $(McrTagsYmlTagGroup:8.0-nanoserver-ltsc2022)