Fix handling of tag parameter

Author: TimHess

.github/workflows/build_config_server.yaml

@@ -39,7 +39,7 @@ jobs:
       run: ./build.ps1 -Name '${{ env.IMAGE_NAME }}' -Registry '${{ env.REGISTRY }}' -Tag '${{ env.TAG }}'
       shell: pwsh
       env:
-        TAG: ${{ github.event_name == 'pull_request' && format('{0}/{1}:pr-{2}', env.REGISTRY, env.IMAGE_NAME, github.event.number) || '' }}
+        TAG: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || '' }}
 
     - name: Login to container registry
       uses: docker/login-action@v3

.github/workflows/build_eureka_server.yaml

@@ -39,7 +39,7 @@ jobs:
       run: ./build.ps1 -Name '${{ env.IMAGE_NAME }}' -Registry '${{ env.REGISTRY }}' -Tag '${{ env.TAG }}'
       shell: pwsh
       env:
-        TAG: ${{ github.event_name == 'pull_request' && format('{0}/{1}:pr-{2}', env.REGISTRY, env.IMAGE_NAME, github.event.number) || '' }}
+        TAG: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || '' }}
 
     - name: Login to container registry
       uses: docker/login-action@v3

.github/workflows/build_springboot_admin_server.yaml

@@ -39,7 +39,7 @@ jobs:
       run: ./build.ps1 -Name '${{ env.IMAGE_NAME }}' -Registry '${{ env.REGISTRY }}' -Tag '${{ env.TAG }}'
       shell: pwsh
       env:
-        TAG: ${{ github.event_name == 'pull_request' && format('{0}/{1}:pr-{2}', env.REGISTRY, env.IMAGE_NAME, github.event.number) || '' }}
+        TAG: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || '' }}
 
     - name: Login to container registry
       uses: docker/login-action@v3

.github/workflows/build_uaa_server.yaml

@@ -39,7 +39,7 @@ jobs:
       run: ./build.ps1 -Name '${{ env.IMAGE_NAME }}' -Registry '${{ env.REGISTRY }}' -Tag '${{ env.TAG }}'
       shell: pwsh
       env:
-        TAG: ${{ github.event_name == 'pull_request' && format('{0}/{1}:pr-{2}', env.REGISTRY, env.IMAGE_NAME, github.event.number) || '' }}
+        TAG: ${{ github.event_name == 'pull_request' && format('pr-{0}', github.event.number) || '' }}
 
     - name: Login to container registry
       uses: docker/login-action@v3

build.ps1

@@ -110,32 +110,32 @@ try {
 
     if (!$Tag) {
         if ($env:GITHUB_ACTIONS -eq "true") {
-            $Tag = "$DockerOrg/${Name}:$Version"
+            $ImageNameWithTag = "$DockerOrg/${Name}:$Version"
             $Revision = Get-Content (Join-Path $ImageDirectory "metadata" "IMAGE_REVISION")
             if ($Revision) {
-                $Tag += "-$Revision"
+                $ImageNameWithTag += "-$Revision"
             }
             $AdditionalTags = "$(Get-Content (Join-Path $ImageDirectory "metadata" "ADDITIONAL_TAGS") | ForEach-Object { $_.replace("$Name","$DockerOrg/$Name") })"
-            Write-Host "If pushed, the image will be available as: $Tag $AdditionalTags"
         }
         else {
-            $Tag = "$DockerOrg/${Name}:dev"
+            $ImageNameWithTag = "$DockerOrg/${Name}:dev"
             $AdditionalTags = ""
-            Write-Host "The image will be locally runnable as: $Tag"
         }
     }
     else {
-        Write-Host "Tag value set by script parameter: $Tag"
+        $ImageNameWithTag = "$DockerOrg/${Name}:$Tag"
         $AdditionalTags = ""
     }
 
+    Write-Host "This image will be available as: $ImageNameWithTag $AdditionalTags"
+
     if ($Name -eq "uaa-server") {
         $Dockerfile = Join-Path $ImageDirectory Dockerfile
         if (!(Test-Path $Dockerfile)) {
             throw "No Dockerfile for $Name (expected $Dockerfile)"
         }
 
-        $docker_command = "docker build -t $Tag $AdditionalTags $ImageDirectory --build-arg SERVER_VERSION=$Version"
+        $docker_command = "docker build -t $ImageNameWithTag $AdditionalTags $ImageDirectory --build-arg SERVER_VERSION=$Version"
         Write-Host $docker_command
         Invoke-Expression $docker_command
     }
@@ -181,8 +181,9 @@ try {
             $bootVersion = Get-Content (Join-path $ImageDirectory "metadata" "SPRING_BOOT_VERSION")
             $serverVersion = Get-Content (Join-Path $ImageDirectory "metadata" "IMAGE_VERSION")
 
-            Write-Host "Building server: $Name@$serverVersion on Spring Boot $bootVersion with primary tag: $Tag"
-            Write-Host "Using source files in: $ImageDirectory | Working directory:" $PWD
+            Write-Host "Building server: $Name@$serverVersion on Spring Boot $bootVersion"
+            Write-Host "Source files: $ImageDirectory"
+            Write-Host "Working directory: $PWD"
 
             # Ensure clean workspace
             Remove-Item -Recurse -Force $serverName -ErrorAction Ignore
@@ -235,7 +236,7 @@ try {
             # Build the image
             Push-Location $serverName
             try {
-                $gradleArgs = @("bootBuildImage", "--imageName=$Tag")
+                $gradleArgs = @("bootBuildImage", "--imageName=$ImageNameWithTag")
                 if ($env:GITHUB_ACTIONS -eq "true") {
                     $gradleArgs += "--no-daemon"
                 }
@@ -247,8 +248,8 @@ try {
             }
 
             foreach ($AdditionalTag in $AdditionalTags.Split(" ", [System.StringSplitOptions]::RemoveEmptyEntries)) {
-                Write-Host "running 'docker tag $Tag $AdditionalTag'"
-                docker tag $Tag $AdditionalTag
+                Write-Host "running 'docker tag $ImageNameWithTag $AdditionalTag'"
+                docker tag $ImageNameWithTag $AdditionalTag
             }
         }
         finally {