Improve CI Docker Build

Author: jan-di

.github/workflows/build.yml

@@ -1,12 +1,19 @@
 name: Build Docker Images
 
 env:
-  BASE_TAG: ghcr.io/${{ github.repository_owner }}/database-backup
+  DOCKERHUB_TAG: 'jandi/database-backup'
+  GITHUB_TAG: 'ghcr.io/jan-di/database-backup'
+  PLATFORMS: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
 
 on:
   push:
-    branches:    
-      - master
+    branches:
+      - 'main'
+    tags:
+      - 'v*'
+  pull_request:
+    branches:
+      - 'main'
 
 jobs:
   multi:
@@ -16,25 +23,50 @@ jobs:
         name: Checkout
         uses: actions/checkout@v2
       -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        name: Docker Metadata
+        id: docker_meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            ${{ env.DOCKERHUB_TAG }}
+            ${{ env.GITHUB_TAG }}
+          tags: |
+            type=ref,event=branch
+            type=ref,event=pr
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+            type=sha
       -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        name: Login to DockerHub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       -
         name: Login to GitHub Container Registry
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v1 
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
       -
         name: Build and push
         uses: docker/build-push-action@v2
         with:
-          platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
-          push: true
-          cache-from: type=registry,ref=${{ env.BASE_TAG }}:latest
+          context: .
+          file: ./Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.docker_meta.outputs.tags }}
+          labels: ${{ steps.docker_meta.outputs.labels }}
+          platforms: ${{ env.PLATFORMS }}
+          cache-from: type=registry,ref=${{ env.GITHUB_TAG }}:main
           cache-to: type=inline
-          tags: |
-            ${{ env.BASE_TAG }}:latest

Dockerfile

@@ -1,9 +1,6 @@
 FROM python:3.9-alpine
 
-LABEL org.opencontainers.image.ref.name="jan-di/database-backup" \
-    org.opencontainers.image.licenses="MIT" \
-    org.opencontainers.image.documentation="https://github.com/jan-di/docker-database-backup/blob/master/README.md" \
-    org.opencontainers.image.source="https://github.com/jan-di/docker-database-backup"
+LABEL org.opencontainers.image.ref.name="jan-di/database-backup"
 
 RUN set -eux; \
     apk --no-cache add \

README.md

@@ -1,11 +1,17 @@
 # Docker Database Backup
 
-[![](https://img.shields.io/github/workflow/status/jan-di/docker-database-backup/Build%20Docker%20Images?style=flat)](https://github.com/jan-di/docker-database-backup/actions/workflows/build.yml)
-[![](https://img.shields.io/github/license/jan-di/docker-database-backup?style=flat)](https://github.com/jan-di/docker-database-backup/blob/master/LICENSE)
+[![Source](https://badgen.net/badge/icon/Source?icon=github&label)](https://github.com/jan-di/docker-database-backup)
+[![Checks](https://badgen.net/github/checks/jan-di/docker-database-backup)](https://github.com/jan-di/docker-database-backup/actions/workflows/build-docker-image.yml)
+[![Release](https://badgen.net/github/release/jan-di/docker-database-backup/stable)](https://github.com/jan-di/docker-database-backup/releases)
+[![Last Commit](https://badgen.net/github/last-commit/jan-di/docker-database-backup/main)](https://github.com/jan-di/docker-database-backup/commits/main)
+[![License](https://badgen.net/github/license/jan-di/docker-database-backup)](https://github.com/jan-di/docker-database-backup/blob/main/LICENSE)
 
-A dockerized service to automatically backup all of your database containers.
+Dockerized service to automatically backup all of your database containers.
 
-Docker Image: `ghcr.io/jan-di/database-backup`
+Docker Image Tags:
+
+- `jandi/database-backup` [Docker Hub](https://hub.docker.com/r/jandi/docker-database-backup)
+- `ghcr.io/jan-di/database-backup` [GitHub Container Registry](https://github.com/jan-di/docker-database-backup/pkgs/container/docker-database-backup)
 
 ## Service Configuration