From 0c253268ead5177ee99869e6ef27b47773cf60d1 Mon Sep 17 00:00:00 2001
From: Ryan Hamilton <ryanehamil@outlook.com>
Date: Wed, 23 Jul 2025 19:08:19 +0000
Subject: [PATCH] Enhance CI workflow: add Docker image tagging step and update
 build and push commands

---
 .gitea/workflows/ci.yml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index 20b6129..7d18f99 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -1,3 +1,4 @@
+
 name: CI
 
 on:
@@ -39,11 +40,18 @@ jobs:
       # - name: Run tests (uncomment if you add tests)
       #   run: npm test
 
-      - name: Build Docker image
-        run: docker build -t pictshare-browse:latest .
+      - name: Set Docker image tag
+        id: vars
+        run: |
+          TAG=$(git describe --tags --abbrev=0 2>/dev/null || git rev-parse --short HEAD)
+          echo "tag=$TAG" >> $GITHUB_OUTPUT
 
-      # - name: Push Docker image (customize for your registry)
-      #   run: |
-      #     echo ${{ secrets.REGISTRY_PASSWORD }} | docker login -u ${{ secrets.REGISTRY_USERNAME }} --password-stdin your.registry.url
-      #     docker tag pictshare-browse:latest your.registry.url/youruser/pictshare-browse:latest
-      #     docker push your.registry.url/youruser/pictshare-browse:latest
+      - name: Build Docker image
+        run: |
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/pictshare-browse:${{ steps.vars.outputs.tag }} -t ${{ secrets.DOCKERHUB_USERNAME }}/pictshare-browse:latest .
+
+      - name: Push Docker image
+        run: |
+          echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/pictshare-browse:${{ steps.vars.outputs.tag }}
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/pictshare-browse:latest