From 970ef214e4034027fe5b02a907f1d10b78fe9ffc Mon Sep 17 00:00:00 2001
From: Karl <karl@k-world.me.uk>
Date: Mon, 30 Jun 2025 17:30:24 +0100
Subject: [PATCH] updated configs and workflow

---
 .gitea/workflows/docker-publish.yml | 39 ++++++++++++++++-------------
 DNSArray.json => _DNSArray.json     |  0
 otherURLs.json => _otherURLs.json   |  0
 dockerfile                          |  3 ++-
 package.json                        |  2 +-
 5 files changed, 24 insertions(+), 20 deletions(-)
 rename DNSArray.json => _DNSArray.json (100%)
 rename otherURLs.json => _otherURLs.json (100%)

diff --git a/.gitea/workflows/docker-publish.yml b/.gitea/workflows/docker-publish.yml
index eab1b25..e6baf5f 100644
--- a/.gitea/workflows/docker-publish.yml
+++ b/.gitea/workflows/docker-publish.yml
@@ -20,28 +20,31 @@ jobs:
       - name: Log in to Docker Registry
         run: echo "${{ secrets.PASSWORD }}" | docker login ${{ secrets.REGISTRY }} -u "${{ secrets.USERNAME }}" --password-stdin
 
+      - name: Determine Version
+        id: version
+        run: |
+          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
+            echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
+          else
+            echo "VERSION=$(jq -r .version package.json)" >> $GITHUB_OUTPUT
+          fi
       - name: Build and Push Docker Images
         run: |
           IMAGE_NAME="ktvmanager-backend"
           REGISTRY="${{ secrets.REGISTRY }}"
           USERNAME="${{ secrets.USERNAME }}"
+          VERSION="${{ steps.version.outputs.VERSION }}"
+          IMAGE_VERSIONED="$REGISTRY/$USERNAME/$IMAGE_NAME:$VERSION"
           IMAGE_LATEST="$REGISTRY/$USERNAME/$IMAGE_NAME:latest"
-
-          # Always build and tag as latest
-          echo "🔧 Building $IMAGE_LATEST"
-          docker build -t $IMAGE_LATEST .
-
+          
+          echo "🔧 Building $IMAGE_VERSIONED"
+          docker build --build-arg VERSION=$VERSION -t "$IMAGE_VERSIONED" .
+          
+          echo "🏷️  Tagging as $IMAGE_LATEST"
+          docker tag "$IMAGE_VERSIONED" "$IMAGE_LATEST"
+          
+          echo "📤 Pushing $IMAGE_VERSIONED"
+          docker push "$IMAGE_VERSIONED"
+          
           echo "📤 Pushing $IMAGE_LATEST"
-          docker push $IMAGE_LATEST
-
-          # If this is a tag push, tag the image accordingly
-          if [[ "${GITHUB_REF}" == refs/tags/* ]]; then
-            GIT_TAG="${GITHUB_REF#refs/tags/}"
-            IMAGE_TAGGED="$REGISTRY/$USERNAME/$IMAGE_NAME:$GIT_TAG"
-
-            echo "🏷️ Also tagging as $IMAGE_TAGGED"
-            docker tag $IMAGE_LATEST $IMAGE_TAGGED
-
-            echo "📤 Pushing $IMAGE_TAGGED"
-            docker push $IMAGE_TAGGED
-          fi
+          docker push "$IMAGE_LATEST"
diff --git a/DNSArray.json b/_DNSArray.json
similarity index 100%
rename from DNSArray.json
rename to _DNSArray.json
diff --git a/otherURLs.json b/_otherURLs.json
similarity index 100%
rename from otherURLs.json
rename to _otherURLs.json
diff --git a/dockerfile b/dockerfile
index 3619a12..8d38c56 100755
--- a/dockerfile
+++ b/dockerfile
@@ -1,6 +1,7 @@
 FROM node:20-alpine
 
-LABEL version="1.0"
+ARG VERSION
+LABEL version=$VERSION
 LABEL description="DNS BACKEND"
 
 WORKDIR /app
diff --git a/package.json b/package.json
index 0b2d7d8..7f52800 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-backend",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "private": true,
   "scripts": {
     "start": "node ./bin/www"