Refactor

Author: mpysiak

.docker/Dockerfile

@@ -87,5 +87,7 @@ RUN chmod +x /entrypoint.sh
 # Expose only the web server port
 EXPOSE 80 8025
 
+LABEL org.opencontainers.image.description="Demo Docker image for showcasing the Sylius Mollie Plugin integration"
+
 # Start all services using Supervisor
 ENTRYPOINT ["/entrypoint.sh"]

.github/workflows/build_and_publish.yml

@@ -1,11 +1,15 @@
-name: Build and Publish Demo Image
+name: Build and Push Docker Image
 
 on:
     push:
         tags:
             - '*'
 
-    workflow_dispatch: ~
+    workflow_dispatch:
+        inputs:
+            version:
+                description: 'Tag version (e.g. 2.0.0)'
+                required: true
 
 jobs:
     build:
@@ -21,7 +25,7 @@ jobs:
               uses: actions/checkout@v3
 
             - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v2
+              uses: docker/setup-buildx-action@v3
 
             - name: Log in to GitHub Container Registry
               uses: docker/login-action@v3
@@ -30,28 +34,35 @@ jobs:
                   username: ${{ github.actor }}
                   password: ${{ secrets.GITHUB_TOKEN }}
 
-            - name: Extract version info
-              id: version
+            - name: Normalize repository name (lowercase)
+              run: |
+                  echo "REPO_LOWER=$(echo '${{ github.repository }}' | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+
+            - name: Set custom tag for manual run
               run: |
                   if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-                    git fetch --tags
-                    TAG_NAME=$(git describe --tags "$(git rev-list --tags --max-count=1)")
+                    echo "CUSTOM_TAG=type=raw,value=${{ github.event.inputs.version }}" >> $GITHUB_ENV
                   else
-                    TAG_NAME="${GITHUB_REF#refs/tags/}"
+                    echo "CUSTOM_TAG=" >> $GITHUB_ENV
                   fi
-                  
-                  MAJOR_MINOR=$(echo "$TAG_NAME" | cut -d. -f1,2)
-                  
-                  echo "Using tag: $TAG_NAME"
-                  echo "TAG=$TAG_NAME" >> $GITHUB_ENV
-                  echo "MAJOR_MINOR=$MAJOR_MINOR" >> $GITHUB_ENV
+
+            - name: Docker meta
+              id: meta
+              uses: docker/metadata-action@v5
+              with:
+                  images: |
+                      ghcr.io/${{ env.REPO_LOWER }}
+                  tags: |
+                      ${{ env.CUSTOM_TAG }}
+                      type=semver,pattern={{version}}
+                      type=semver,pattern={{major}}.{{minor}}
+                  flavor: |
+                      latest=false
 
             - name: Build and push Docker image
-              uses: docker/build-push-action@v2
+              uses: docker/build-push-action@v6
               with:
                   context: .
+                  file: .docker/Dockerfile
                   push: true
-                  tags: |
-                      ghcr.io/${{ github.repository_owner }}/$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]'):${{ env.TAG }}
-                      ghcr.io/${{ github.repository_owner }}/$(echo "${{ github.repository }}" | tr '[:upper:]' '[:lower:]'):${{ env.MAJOR_MINOR }}
-                  
+                  tags: ${{ steps.meta.outputs.tags }}