From de303c9046691ca871bba5ed777cb752f0fea70c Mon Sep 17 00:00:00 2001
From: Julian Nonino <noninojulian@gmail.com>
Date: Wed, 10 Dec 2025 11:06:23 +0000
Subject: [PATCH] Update pipelines

---
 .github/workflows/ci.yml      | 27 +++++++++++++++++++++------
 .github/workflows/publish.yml | 29 +++++++++++++++++++++--------
 2 files changed, 42 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6f26094..fb7688e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,17 +1,32 @@
-name: Docker Image CI
+name: CI
 
 on:
   push:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-    
+
+env:
+  IMAGE_NAME: ${{ github.repository }}
+
 jobs:
   build:
     name: Build Docker image
     runs-on: ubuntu-latest
-
     steps:
-    - uses: actions/checkout@v5
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag ${{ secrets.DOCKER_IMAGE_NAME }}:$(date +%s)
+      - name: Checkout repository
+        uses: actions/checkout@v6
+      - name: Process metadata (tags, labels)
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ secrets.DOCKER_ORGANIZATION }}/${{ env.IMAGE_NAME }}
+            ${{ vars.REGISTRY_GITHUB }}/${{ env.IMAGE_NAME }}
+      - name: Build image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: false
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 6a373bc..f4a7aee 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -1,16 +1,20 @@
-name: Publish Docker image
+name: Publish image
 
 on:
   release:
     types: [published]
 
 env:
-  REGISTRY: docker.io
+  IMAGE_NAME: ${{ github.repository }}
 
 jobs:
   push_to_registry:
-    name: Push Docker image to Docker Hub
+    name: Push image to registries
     runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v5
@@ -18,23 +22,32 @@ jobs:
       - name: Log in to Docker Hub
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ${{ vars.DOCKER_REGISTRY }}
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
+      - name: Login to GitHub registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ vars.REGISTRY_GITHUB }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Docker meta
+      - name: Process metadata (tags, labels)
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ secrets.DOCKER_ORGANIZATION }}/${{ secrets.DOCKER_IMAGE_NAME }}
+          images: |
+            ${{ secrets.DOCKER_ORGANIZATION }}/${{ env.IMAGE_NAME }}
+            ${{ vars.REGISTRY_GITHUB }}/${{ env.IMAGE_NAME }}
 
-      - name: Build and push Docker image
+      - name: Build and push image
         uses: docker/build-push-action@v6
         with:
           context: .
@@ -46,6 +59,6 @@ jobs:
       - name: Update DockerHub repository description
         uses: peter-evans/dockerhub-description@v5
         with:
-          repository: ${{ secrets.DOCKER_ORGANIZATION }}/${{ secrets.DOCKER_IMAGE_NAME }}
+          repository: ${{ secrets.DOCKER_ORGANIZATION }}/${{ env.IMAGE_NAME }}
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}