missed a sytle plate

learning to use shields.io

.gitea/workflows/build.yml

@@ -1,52 +0,0 @@
-name: Docker Image CI
-
-on:
-  push:
-    branches:
-      - "main"
-    tags:
-      - "*" # This triggers the workflow on any tag push
-
-jobs:
-  build-and-push-image:
-    runs-on: prodesk
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.calahilstudios.com
-          username: ${{ secrets.REGISTRY_USER }}
-          password: ${{ secrets.REGISTRY_TOKEN }}
-
-      - name: Prepare tags
-        id: prepare_tags
-        run: |
-          # The image reference for your Gitea registry
-          IMAGE_REF=gitea.calahilstudios.com/calahil/backupbot
-
-          # The main tags: latest and commit SHA
-          TAGS="${IMAGE_REF}:latest,${IMAGE_REF}:${{ gitea.sha }}"
-
-          # If the event is a tag push, add the git tag as a tag
-          if [[ "${{ gitea.ref_type }}" == "tag" ]]; then
-            GIT_TAG_NAME=$(basename "${{ gitea.ref }}")
-            TAGS="${TAGS},${IMAGE_REF}:${GIT_TAG_NAME}"
-          fi
-
-          # Set the tags as a step output
-          echo "DOCKER_TAGS=${TAGS}" >> $GITEA_ENV
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: ./Dockerfile
-          push: true
-          tags: ${{ steps.prepare_tags.outputs.DOCKER_TAGS }}

.github/workflows/build.yml

@@ -0,0 +1,77 @@
+name: Build and Push Docker Image
+
+on:
+  push:
+    branches:
+      - main
+    tags:
+      - "v*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      # 🧠 Login to Docker Hub
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: docker.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      # 🧠 Login to GitHub Container Registry
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # 🧠 Login to Gitea
+      - name: Login to Gitea
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.calahilstudios.com
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITEA_TOKEN }}
+
+      - name: Debug GitHub context
+        run: |
+          echo "Owner: ${{ github.repository_owner }}"
+          echo "Repo:  ${{ github.event.repository.name }}"
+          echo "Full repo: ${{ github.repository }}"
+
+      - name: Docker metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ghcr.io/${{ github.repository }}
+            gitea.calahilstudios.com/${{ github.repository }}
+            ${{ github.repository }}
+          tags: |
+            # Always include short SHA
+            type=sha,format=short
+
+            # Include latest if on default branch (usually 'main' or 'develop')
+            type=raw,value=latest,enable={{is_default_branch}}
+
+            # If this is a semver tag (vX.X.X), add full + minor version tags
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

README.md

@@ -1,13 +1,12 @@
 # BackupBot 🤖
 
-[![License](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
-[![Docker](https://img.shields.io/badge/Docker-Enabled-2496ED?logo=docker&logoColor=white)](https://www.docker.com/)
-[![Gitea](https://img.shields.io/badge/Gitea-calahilstudios.com-609926?logo=gitea&logoColor=white)](https://gitea.calahilstudios.com)
-![Gitea Stars](https://img.shields.io/gitea/stars/calahil/backupbot?gitea_url=https%3A%2F%2Fgitea.calahilstudios.com&logo=gitea&link=https%3A%2F%2Fgitea.calahilstudios.com)
-![Gitea Release](https://img.shields.io/gitea/v/release/calahil/backupbot?gitea_url=https%3A%2F%2Fgitea.calahilstudios.com&display_name=tag&logo=gitea&link=https%3A%2F%2Fgitea.calahilstudios.com%2Fcalahil%2Fbackupbot%2Freleases)
 
-[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/duplicati.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/duplicati)
+![Docker Image Version (tag)](https://img.shields.io/docker/v/calahil/backupbot/latest?arch=amd64&style=for-the-badge&logo=docker&logoColor=white&labelColor=blue&color=green)
-[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/duplicati.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/duplicati)
+![Docker Pulls](https://img.shields.io/docker/pulls/calahil/backupbot?style=for-the-badge&logo=docker&logoColor=white&labelColor=blue&color=green)
+![Docker Stars](https://img.shields.io/docker/stars/calahil/backupbot?style=for-the-badge&logo=docker&logoColor=white&labelColor=blue&color=green)
+![GitHub License](https://img.shields.io/github/license/calahil/backupbot?style=for-the-badge&logo=docker&logoColor=white&labelColor=blue&color=green)
+![GitHub Release](https://img.shields.io/github/v/release/calahil/backupbot?display_name=release&style=for-the-badge&logo=github&labelColor=blue&color=green)
+
 
 > **Automated Docker backup system for PostgreSQL databases and application configurations with Duplicati integration**