From 11fc74b35d807f08568ad52455f43c71dd9d34a0 Mon Sep 17 00:00:00 2001
From: Matthew McKinnon <mmckinnon@comprofix.com>
Date: Sat, 6 Sep 2025 18:34:30 +1000
Subject: [PATCH] chore: update for production

---
 .gitea/workflows/production.yml | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitea/workflows/production.yml b/.gitea/workflows/production.yml
index 15e6dfb..1abcddb 100644
--- a/.gitea/workflows/production.yml
+++ b/.gitea/workflows/production.yml
@@ -3,13 +3,11 @@ name: Build and Deploy Production
 on:
   push:
     tags:
-      - "v*"
+      - "v*.*.*"
 
 jobs:
   build-and-push:
     runs-on: ubuntu-latest
-    container:
-      image: catthehacker/ubuntu:act-latest
     env:
       DOCKER_REGISTRY: git.comprofix.com
       IMAGE_NAME: mmckinnon/comprofix.com
@@ -24,13 +22,19 @@ jobs:
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_TOKEN }}
 
-      - name: Build and push Docker image
+      - name: Extract version from tag
+        id: vars
+        run: echo "VERSION=${GITHUB_REF_NAME}" >> $GITHUB_ENV
+
+      - name: Build and push Docker images
         uses: docker/build-push-action@v6
         with:
           context: .
           file: ./Dockerfile
           push: true
-          tags: ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+          tags: |
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+            ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
           build-args: |
             HUGO_BASEURL=https://comprofix.com/
 
@@ -52,10 +56,16 @@ jobs:
 
           echo "Uploading docker-compose.yml and .env.production..."
           scp docker-compose.yml $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH
-          scp .env.production $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/.env
+
+          # Replace IMAGE_TAG in .env.production with the current VERSION
+          sed "s/^IMAGE_TAG=.*/IMAGE_TAG=${{ env.VERSION }}/" .env.production > .env.production.new
+
+          scp .env.production.new $DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/.env.production
 
           echo "Deploying production container..."
           ssh -o StrictHostKeyChecking=no $DEPLOY_USER@$DEPLOY_HOST "
             cd $DEPLOY_PATH
-            docker compose --env-file .env up -d
+            docker compose --env-file .env.production down --remove-orphans
+            docker compose --env-file .env.production pull --ignore-pull-failures
+            docker compose --env-file .env.production up -d
           "