v2.5.3

.gitattributes

@@ -24,3 +24,7 @@
 manifest.webmanifest       text eol=lf
 docker/*.conf              text eol=lf
 Dockerfile                 text eol=lf
+
+*.zip                      -text
+*.webp                     -text
+*.pdf                      -text

.github/workflows/main.yml

@@ -44,18 +44,6 @@ jobs:
       steps:
          -  uses: actions/checkout@master
 
-         # Avoid the following error when building multiple large images:
-         # `System.IO.IOException: No space left on device : '/home/runner/runners/2.319.1/_diag/Worker_20240826-130726-utc.log'`
-         # See also: https://docs.github.com/en/actions/using-github-hosted-runners/using-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories
-         -  name: Free Disk Space (Ubuntu)
-            uses: insightsengineering/disk-space-reclaimer@v1
-            with:
-               android: true
-               dotnet: true
-               haskell: true
-               large-packages: true
-               swap-storage: true
-               docker-images: false
          # See: https://stackoverflow.com/a/58178121
          -  name: Set Env
             run: |
@@ -63,28 +51,24 @@ jobs:
                # Strip "v" prefix from tag name
                [[ "${{ github.ref }}" == "refs/tags/"* ]] && IMAGE_VERSION=$(echo $IMAGE_VERSION | sed -e 's/^v//')
                echo "IMAGE_VERSION=$IMAGE_VERSION" >> $GITHUB_ENV
-         
+
                echo "IMAGE_ID=$(echo ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME | tr '[A-Z]' '[a-z]')" >> $GITHUB_ENV
 
-         # region See: https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio     
+         # region See: https://docs.github.com/en/packages/managing-github-packages-using-github-actions-workflows/publishing-and-installing-a-package-with-github-actions#upgrading-a-workflow-that-accesses-ghcrio
-         -  name: Use QEMU
+         -  name: Build Image
-            uses: docker/setup-qemu-action@master
+            run: |
-            with:
+               docker build -t $IMAGE_NAME .
-             platforms: arm64,amd64
-      
-         - name: Set up Docker Buildx
-           id: buildx
-           uses: docker/setup-buildx-action@master
 
          -  name: Log In to Registry
             run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
 
-         -  name: Build the docker image 
+         -  name: Push Image
-            uses: docker/build-push-action@master
+            run: |
-            with:
+               echo IMAGE_ID=$IMAGE_ID
-             context: .
+               echo IMAGE_VERSION=$IMAGE_VERSION
-             builder: ${{ steps.buildx.outputs.name }}
+               docker tag $IMAGE_NAME $IMAGE_ID:$IMAGE_VERSION
-             platforms: linux/arm64,linux/amd64
+               # Always tag latest when pushing a tag, as we don't expect to ever merge old tags
-             push: true
+               [[ "${{ github.ref }}" == "refs/tags/"* ]] && docker tag $IMAGE_NAME $IMAGE_ID:latest
-             tags: ghcr.io/${{ github.repository_owner }}/5etools-img:latest               
+               docker push $IMAGE_ID:$IMAGE_VERSION
+               docker push $IMAGE_ID:latest
          # endregion