Remove FloatingTagSuffix infrastructure and usage (#1175)

dotnet · Aug 13, 2024 · 67c539b · 67c539b
1 parent e6b81c5
commit 67c539b
Show file tree

Hide file tree

Showing 14 changed files with 151 additions and 157 deletions.
diff --git a/build.ps1 b/build.ps1
@@ -7,7 +7,7 @@ param(
 Set-StrictMode -Version Latest
 $ErrorActionPreference = 'Stop'
 pushd $PSScriptRoot
-$ImageBuilderCustomArgs = "$ImageBuilderCustomArgs --var UniqueId=$(Get-Date -Format yyyyMMddHHmmss) --var FloatingTagSuffix=local"
+$ImageBuilderCustomArgs = "$ImageBuilderCustomArgs --var UniqueId=$(Get-Date -Format yyyyMMddHHmmss)"
 try {
     ./eng/common/Invoke-ImageBuilder.ps1 "build --path '$DockerfilePath' $ImageBuilderCustomArgs"
 }

diff --git a/eng/pipelines/variables/common.yml b/eng/pipelines/variables/common.yml
@@ -15,14 +15,8 @@ variables:
   value: ''
 - name: publicGitRepoUri
   value: https://github.com/dotnet/dotnet-buildtools-prereqs-docker
-- ${{ if eq(variables['Build.SourceBranch'], 'refs/heads/main') }}:
-  - name: floatingTagSuffix
-    value: ""
-- ${{ else }}:
-  - name: floatingTagSuffix
-    value: $(Build.SourceBranchName)
 - name: manifestVariables
-  value: --var UniqueId=$(sourceBuildId) --var FloatingTagSuffix=$(floatingTagSuffix)
+  value: --var UniqueId=$(sourceBuildId)
 - name: publicSourceBranch
   value: main
 - name: ingestKustoImageInfo

diff --git a/src/almalinux/manifest.json b/src/almalinux/manifest.json
@@ -11,7 +11,7 @@
               "osVersion": "almalinux8",
               "tags": {
                 "almalinux-8-source-build-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "almalinux-8-source-build$(FloatingTagSuffix)": {}
+                "almalinux-8-source-build": {}
               }
             },
             {
@@ -20,7 +20,7 @@
               "osVersion": "almalinux8",
               "tags": {
                 "almalinux-8-helix-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "almalinux-8-helix-amd64$(FloatingTagSuffix)": {}
+                "almalinux-8-helix-amd64": {}
               }
             }
           ]

diff --git a/src/alpine/manifest.json b/src/alpine/manifest.json
@@ -11,7 +11,7 @@
               "osVersion": "alpine3.17",
               "tags": {
                 "alpine-3.17-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.17$(FloatingTagSuffix)": {},
+                "alpine-3.17": {},
                 "alpine-3.17-local": {
                   "isLocal": true
                 }
@@ -28,7 +28,7 @@
               "osVersion": "alpine3.17",
               "tags": {
                 "alpine-3.17-helix-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.17-helix-amd64$(FloatingTagSuffix)": {}
+                "alpine-3.17-helix-amd64": {}
               }
             }
           ]
@@ -42,7 +42,7 @@
               "osVersion": "alpine3.17",
               "tags": {
                 "alpine-3.17-helix-arm32v7-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.17-helix-arm32v7$(FloatingTagSuffix)": {}
+                "alpine-3.17-helix-arm32v7": {}
               },
               "variant": "v7"
             }
@@ -57,7 +57,7 @@
               "osVersion": "alpine3.17",
               "tags": {
                 "alpine-3.17-helix-arm64v8-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.17-helix-arm64v8$(FloatingTagSuffix)": {}
+                "alpine-3.17-helix-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -72,7 +72,7 @@
               "osVersion": "alpine3.18",
               "tags": {
                 "alpine-3.18-helix-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.18-helix-amd64$(FloatingTagSuffix)": {}
+                "alpine-3.18-helix-amd64": {}
               }
             }
           ]
@@ -86,7 +86,7 @@
               "osVersion": "alpine3.18",
               "tags": {
                 "alpine-3.18-helix-arm32v7-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.18-helix-arm32v7$(FloatingTagSuffix)": {}
+                "alpine-3.18-helix-arm32v7": {}
               },
               "variant": "v7"
             }
@@ -101,7 +101,7 @@
               "osVersion": "alpine3.18",
               "tags": {
                 "alpine-3.18-helix-arm64v8-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.18-helix-arm64v8$(FloatingTagSuffix)": {}
+                "alpine-3.18-helix-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -115,7 +115,7 @@
               "osVersion": "alpine3.18",
               "tags": {
                 "alpine-3.18-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.18$(FloatingTagSuffix)": {},
+                "alpine-3.18": {},
                 "alpine-3.18-local": {
                   "isLocal": true
                 }
@@ -131,7 +131,7 @@
               "osVersion": "alpine3.18",
               "tags": {
                 "alpine-3.18-WithNode-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.18-WithNode$(FloatingTagSuffix)": {}
+                "alpine-3.18-WithNode": {}
               }
             }
           ]
@@ -144,7 +144,7 @@
               "osVersion": "alpine3.19",
               "tags": {
                 "alpine-3.19-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.19$(FloatingTagSuffix)": {},
+                "alpine-3.19": {},
                 "alpine-3.19-local": {
                   "isLocal": true
                 }
@@ -160,7 +160,7 @@
               "osVersion": "alpine3.19",
               "tags": {
                 "alpine-3.19-WithNode-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.19-WithNode$(FloatingTagSuffix)": {}
+                "alpine-3.19-WithNode": {}
               }
             }
           ]
@@ -174,7 +174,7 @@
               "osVersion": "alpine3.20",
               "tags": {
                 "alpine-3.20-helix-amd64-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.20-helix-amd64$(FloatingTagSuffix)": {}
+                "alpine-3.20-helix-amd64": {}
               }
             }
           ]
@@ -188,7 +188,7 @@
               "osVersion": "alpine3.20",
               "tags": {
                 "alpine-3.20-helix-arm32v7-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.20-helix-arm32v7$(FloatingTagSuffix)": {}
+                "alpine-3.20-helix-arm32v7": {}
               },
               "variant": "v7"
             }
@@ -203,7 +203,7 @@
               "osVersion": "alpine3.20",
               "tags": {
                 "alpine-3.20-helix-arm64v8-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.20-helix-arm64v8$(FloatingTagSuffix)": {}
+                "alpine-3.20-helix-arm64v8": {}
               },
               "variant": "v8"
             }
@@ -217,7 +217,7 @@
               "osVersion": "alpine3.20",
               "tags": {
                 "alpine-3.20-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.20$(FloatingTagSuffix)": {},
+                "alpine-3.20": {},
                 "alpine-3.20-local": {
                   "isLocal": true
                 }
@@ -233,7 +233,7 @@
               "osVersion": "alpine3.20",
               "tags": {
                 "alpine-3.20-withnode-$(System:TimeStamp)-$(System:DockerfileGitCommitSha)": {},
-                "alpine-3.20-withnode$(FloatingTagSuffix)": {}
+                "alpine-3.20-withnode": {}
               }
             }
           ]