ci: refactor Docker build and push steps for clarity and maintainability

Author: jjjermiah

.github/workflows/check-bioc.yml

@@ -300,67 +300,67 @@ jobs:
                   name: ${{ runner.os }}-biocversion-${{ matrix.config.bioc }}-r-${{ matrix.config.r }}-results
                   path: check
 
-docker-build-and-push:
-    runs-on: ubuntu-latest
-    needs: build-check
-    if: "!contains(github.event.head_commit.message, '/nodocker') && env.run_docker == 'true' && github.ref == 'refs/heads/devel'"
-    steps:
-        - name: Checkout Repository
-          uses: actions/checkout@v3
-
-        - name: Extract package version from DESCRIPTION
-          id: pkg_version
-          run: |
-              PKG_VERSION=$(grep "^Version:" DESCRIPTION | awk '{print $2}')
-              echo "PKG_VERSION=$PKG_VERSION" >> $GITHUB_ENV
-              echo "Package version: $PKG_VERSION"
-
-        - name: Set repository name as environment variable
-          run: |
-              REPO_NAME=$(echo ${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]')
-              echo "CONT_IMG_NAME=$REPO_NAME" >> $GITHUB_ENV
-
-        - name: Check if container with this version already exists
-          id: check_image
-          run: |
-              # Install jq for JSON parsing
-              sudo apt-get update && sudo apt-get install -y jq
-
-              # Query Docker Hub API
-              TAG_EXISTS=$(curl -s "https://hub.docker.com/v2/repositories/${{ secrets.DOCKERHUB_USERNAME }}/${CONT_IMG_NAME}/tags/${{ env.PKG_VERSION }}/" | jq -r '.name')
-
-              if [ "$TAG_EXISTS" = "${{ env.PKG_VERSION }}" ]; then
-                echo "Container with version ${{ env.PKG_VERSION }} already exists. Will only push devel tag."
-                echo "PUSH_VERSION=false" >> $GITHUB_ENV
-              else
-                echo "Container with version ${{ env.PKG_VERSION }} not found. Will push both version and devel tags."
-                echo "PUSH_VERSION=true" >> $GITHUB_ENV
-              fi
-
-        - name: Set up Docker Buildx
-          uses: docker/setup-buildx-action@v2
-
-        - name: Login to Docker Hub
-          uses: docker/login-action@v2
-          with:
-              username: ${{ secrets.DOCKERHUB_USERNAME }}
-              password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-        - name: Build and Push Docker (version + devel tags)
-          if: env.PUSH_VERSION == 'true'
-          uses: docker/build-push-action@v4
-          with:
-              context: .
-              push: true
-              tags: |
-                  ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.CONT_IMG_NAME }}:${{ env.PKG_VERSION }}
-                  ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.CONT_IMG_NAME }}:devel
-
-        - name: Build and Push Docker (devel tag only)
-          if: env.PUSH_VERSION == 'false'
-          uses: docker/build-push-action@v4
-          with:
-              context: .
-              push: true
-              tags: |
-                  ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.CONT_IMG_NAME }}:devel
+    docker-build-and-push:
+        runs-on: ubuntu-latest
+        needs: build-check
+        if: "!contains(github.event.head_commit.message, '/nodocker') && env.run_docker == 'true' && github.ref == 'refs/heads/devel'"
+        steps:
+          - name: Checkout Repository
+            uses: actions/checkout@v3
+
+          - name: Extract package version from DESCRIPTION
+            id: pkg_version
+            run: |
+                PKG_VERSION=$(grep "^Version:" DESCRIPTION | awk '{print $2}')
+                echo "PKG_VERSION=$PKG_VERSION" >> $GITHUB_ENV
+                echo "Package version: $PKG_VERSION"
+
+          - name: Set repository name as environment variable
+            run: |
+                REPO_NAME=$(echo ${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]')
+                echo "CONT_IMG_NAME=$REPO_NAME" >> $GITHUB_ENV
+
+          - name: Check if container with this version already exists
+            id: check_image
+            run: |
+                # Install jq for JSON parsing
+                sudo apt-get update && sudo apt-get install -y jq
+
+                # Query Docker Hub API
+                TAG_EXISTS=$(curl -s "https://hub.docker.com/v2/repositories/${{ secrets.DOCKERHUB_USERNAME }}/${CONT_IMG_NAME}/tags/${{ env.PKG_VERSION }}/" | jq -r '.name')
+
+                if [ "$TAG_EXISTS" = "${{ env.PKG_VERSION }}" ]; then
+                    echo "Container with version ${{ env.PKG_VERSION }} already exists. Will only push devel tag."
+                    echo "PUSH_VERSION=false" >> $GITHUB_ENV
+                else
+                    echo "Container with version ${{ env.PKG_VERSION }} not found. Will push both version and devel tags."
+                    echo "PUSH_VERSION=true" >> $GITHUB_ENV
+                fi
+
+          - name: Set up Docker Buildx
+            uses: docker/setup-buildx-action@v2
+
+          - name: Login to Docker Hub
+            uses: docker/login-action@v2
+            with:
+                username: ${{ secrets.DOCKERHUB_USERNAME }}
+                password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+          - name: Build and Push Docker (version + devel tags)
+            if: env.PUSH_VERSION == 'true'
+            uses: docker/build-push-action@v4
+            with:
+                context: .
+                push: true
+                tags: |
+                    ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.CONT_IMG_NAME }}:${{ env.PKG_VERSION }}
+                    ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.CONT_IMG_NAME }}:devel
+
+          - name: Build and Push Docker (devel tag only)
+            if: env.PUSH_VERSION == 'false'
+            uses: docker/build-push-action@v4
+            with:
+                context: .
+                push: true
+                tags: |
+                    ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.CONT_IMG_NAME }}:devel