Refactor Docker workflow for improved structure

Author: pvgenuchten

.github/workflows/docker-image.yml

@@ -1,71 +1,42 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# Triggers a Docker workflow on completion of the "build" workflow but
-# pushes to GitHub Container Registry 
-#
-# Author: Edward Lewis - 2021
-
-name: GHCR
+name: Build and Publish Docker Image (Release)
 
 on:
-  workflow_dispatch:
   push:
-    branches:
-      - 'master'
     tags:
-      - '*'
-  pull_request:
-    branches:
-      - 'master'
+      - "*.*.*"   # Adjust if you use a different tagging scheme
 
-env:
-  REGISTRY: ghcr.io
-  IMAGE_NAME: pygeodatacrawler
+permissions:
+  contents: read
+  packages: write
 
 jobs:
-  # Push image to GitHub Packages.
-  # See also https://docs.docker.com/docker-hub/builds/
-  push:
+  build-and-push:
     runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    permissions:
-      packages: write
-      contents: read
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-      - name: Build image
-        run: docker build . --file Dockerfile --tag $IMAGE_NAME --label "runnumber=${GITHUB_RUN_ID}"
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      - name: Log in to registry
-        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+      - name: Log in to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Rename image for publication
+      - name: Extract tag name
+        id: vars
         run: |
-          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME
-
-          # Change all uppercase to lowercase
-          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')
-          # Strip git ref prefix from version
-          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
-          # Strip "v" prefix from tag name
-          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
-          # Use Docker `latest` tag convention
-          [ "$VERSION" == "master" ] && VERSION=latest
-          echo IMAGE_ID=$IMAGE_ID
-          echo VERSION=$VERSION
-          echo FULLCONTAINERNAME=$IMAGE_ID:$VERSION >> $GITHUB_ENV
-          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
-
-      - name: Push to CR
-        run: docker push ${{ env.FULLCONTAINERNAME }}
-
-  on-failure:
-    runs-on: ubuntu-latest
-    if: ${{ github.event.workflow_run.conclusion == 'failure' }}
-    steps:
-      - name: Print Test Fail
-        run: echo Tests Failed        
+          echo "TAG=${GITHUB_REF_NAME}" >> $GITHUB_OUTPUT
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}:${{ steps.vars.outputs.TAG }}
+            ghcr.io/${{ github.repository }}:latest