docker.yml: fix build for tag

Author: rouault

.github/workflows/docker.yml

@@ -99,6 +99,8 @@ jobs:
           VERSION=sha-${GITHUB_SHA::8}
           if [[ $GITHUB_REF == refs/tags/* ]]; then
             VERSION=${GITHUB_REF/refs\/tags\//}
+            # 9.8.0-x --> 9.8.0
+            VERSION=$(echo $VERSION | sed "s/-.*//" )
           fi
           echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
           echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
@@ -109,6 +111,7 @@ jobs:
             ARCH=amd64
           fi
           echo "ARCH=$ARCH" >> $GITHUB_OUTPUT
+
       - name: Build docs image
         uses: docker/build-push-action@v6
         if: matrix.container == 'proj-docs'
@@ -131,6 +134,21 @@ jobs:
             org.opencontainers.image.revision=${{ github.sha }}
             org.opencontainers.image.version=${{ steps.prep.outputs.VERSION }}
             org.opencontainers.image.created=${{ steps.prep.outputs.BUILD_DATE }}
+
+      - name: Prepare tags
+        id: prep_tags
+        run: |
+          TAGS="docker.io/osgeo/${{ matrix.container }}:${{ steps.prep.outputs.VERSION }}-${{ steps.prep.outputs.ARCH }}
+          ghcr.io/osgeo/${{ matrix.container }}:${{ steps.prep.outputs.VERSION }}-${{ steps.prep.outputs.ARCH }}"
+          if [ "${GITHUB_REF}" = "refs/heads/master" ]; then
+            TAGS="$TAGS
+            docker.io/osgeo/${{ matrix.container }}:latest-${{ steps.prep.outputs.ARCH }}
+            ghcr.io/osgeo/${{ matrix.container }}:latest"-${{ steps.prep.outputs.ARCH }}"
+          fi
+          echo "tags<<EOF" >> $GITHUB_OUTPUT
+          echo "$TAGS" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
       - name: Build image
         uses: docker/build-push-action@v6
         id: push
@@ -141,11 +159,7 @@ jobs:
           context: .
           file: ${{ matrix.dockerfile }}
           platforms: linux/${{ steps.prep.outputs.ARCH }}
-          tags: |
-            docker.io/osgeo/${{ matrix.container }}:${{ steps.prep.outputs.VERSION }}-${{ steps.prep.outputs.ARCH }}
-            docker.io/osgeo/${{ matrix.container }}:latest-${{ steps.prep.outputs.ARCH }}
-            ghcr.io/osgeo/${{ matrix.container }}:${{ steps.prep.outputs.VERSION }}-${{ steps.prep.outputs.ARCH }}
-            ghcr.io/osgeo/${{ matrix.container }}:latest-${{ steps.prep.outputs.ARCH }}
+          tags: ${{ steps.prep_tags.outputs.tags }}
           labels: |
             org.opencontainers.image.title=${{ github.event.repository.name }}
             org.opencontainers.image.description=${{ github.event.repository.description }}
@@ -189,16 +203,38 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
+      - name: Prepare
+        id: prep
+        run: |
+          VERSION=sha-${GITHUB_SHA::8}
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF/refs\/tags\//}
+            # 9.8.0-x --> 9.8.0
+            VERSION=$(echo $VERSION | sed "s/-.*//" )
+          fi
+          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
+
       - name: Create and push multi-platform manifest
         if: env.PUSH_PACKAGES == 'true'
         run: |
           docker buildx imagetools create \
-          -t ghcr.io/osgeo/proj:latest \
-          ghcr.io/osgeo/proj:latest-amd64 \
-          ghcr.io/osgeo/proj:latest-arm64
+              -t ghcr.io/osgeo/proj:${{ steps.prep.outputs.VERSION }} \
+              ghcr.io/osgeo/proj:${{ steps.prep.outputs.VERSION }}-amd64 \
+              ghcr.io/osgeo/proj:${{ steps.prep.outputs.VERSION }}-arm64
 
           docker buildx imagetools create \
-          -t osgeo/proj:latest \
-          osgeo/proj:latest-amd64 \
-          osgeo/proj:latest-arm64
-  
+              -t osgeo/proj:${{ steps.prep.outputs.VERSION }} \
+              osgeo/proj:${{ steps.prep.outputs.VERSION }}-amd64 \
+              osgeo/proj:${{ steps.prep.outputs.VERSION }}-arm64
+
+          if [ "${GITHUB_REF}" = "refs/heads/master" ]; then
+              docker buildx imagetools create \
+                  -t ghcr.io/osgeo/proj:latest \
+                  ghcr.io/osgeo/proj:latest-amd64 \
+                  ghcr.io/osgeo/proj:latest-arm64
+
+              docker buildx imagetools create \
+                  -t osgeo/proj:latest \
+                  osgeo/proj:latest-amd64 \
+                  osgeo/proj:latest-arm64
+          fi