From cff329a4c449ba6b4b2ab36cd6fb65fc545025e3 Mon Sep 17 00:00:00 2001
From: jamesratcliffe101 <jamesratcliffe123@gmail.com>
Date: Thu, 4 Jun 2026 22:06:50 +0100
Subject: [PATCH] first fill deploy test with new runner container

---
 .gitea/workflows/deploy.yml | 36 +++++++++++++++++++++++++++++++++++-
 deploy.yml.bak              | 33 ---------------------------------
 2 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
index 547287a..99abdea 100644
--- a/.gitea/workflows/deploy.yml
+++ b/.gitea/workflows/deploy.yml
@@ -1,8 +1,11 @@
+
 name: Build and Deploy NextJS SculptedArc Website
 on: [push]
 
 jobs:
+
   build-and-deploy:
+
     runs-on: ubuntu-latest
 
     defaults:
@@ -10,10 +13,41 @@ jobs:
         shell: sh
 
     steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v4
+
       # 1. Log into your self-hosted gitea container storage layer
       - name: Log in to gitea Container Registry
         uses: docker/login-action@v4
         with:
           registry: gitea.sculpted-arc.co.uk # Change to your gitea domain
           username: ${{ gitea.actor }}
-          password: ${{ secrets.TOKEN_GITEA }} # Store a personal access token in your repo secrets for security
\ No newline at end of file
+          password: ${{ secrets.TOKEN_GITEA }} # Store a personal access token in your repo secrets for security
+
+      # 2. Build the Dockerfile and upload the compiled app image
+      - name: Build and Push Docker Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: gitea.sculpted-arc.co.uk/${{ gitea.repository }}:latest
+
+      # 3. Securely SSH to the host using masked secrets
+      - name: Deploy to Server via SSH
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: root
+          key: ${{ secrets.SSH_PRIVATE_KEY }} # Completely invisible to anyone viewing code
+          script: |
+            cd /home/james/docker/sculpted-arc-site
+            
+            # Authenticate the host machine to pull from gitea's registry
+            docker login -u ${{ gitea.actor }} -p ${{ secrets.TOKEN_GITEA }} gitea.sculpted-arc.co.uk
+            
+            # Pull down the fresh image we just built and restart gracefully
+            docker compose pull
+            docker compose up -d --remove-orphans
\ No newline at end of file
diff --git a/deploy.yml.bak b/deploy.yml.bak
index 70c0b83..d42a358 100644
--- a/deploy.yml.bak
+++ b/deploy.yml.bak
@@ -2,9 +2,7 @@ name: Build and Deploy NextJS SculptedArc Website
 on: [push]
 
 jobs:
-
   build-and-deploy:
-
     runs-on: ubuntu-latest
 
     defaults:
@@ -12,12 +10,6 @@ jobs:
         shell: sh
 
     steps:
-      - name: Check out repository code
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v4
-
       # 1. Log into your self-hosted gitea container storage layer
       - name: Log in to gitea Container Registry
         uses: docker/login-action@v4
@@ -25,28 +17,3 @@ jobs:
           registry: gitea.sculpted-arc.co.uk # Change to your gitea domain
           username: ${{ gitea.actor }}
           password: ${{ secrets.TOKEN_GITEA }} # Store a personal access token in your repo secrets for security
-
-      # 2. Build the Dockerfile and upload the compiled app image
-      - name: Build and Push Docker Image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: gitea.sculpted-arc.co.uk/${{ gitea.repository }}:latest
-
-      # 3. Securely SSH to the host using masked secrets
-      - name: Deploy to Server via SSH
-        uses: appleboy/ssh-action@v1.0.3
-        with:
-          host: ${{ secrets.SERVER_HOST }}
-          username: root
-          key: ${{ secrets.SSH_PRIVATE_KEY }} # Completely invisible to anyone viewing code
-          script: |
-            cd /home/james/docker/sculpted-arc-site
-            
-            # Authenticate the host machine to pull from gitea's registry
-            docker login -u ${{ gitea.actor }} -p ${{ secrets.TOKEN_GITEA }} gitea.sculpted-arc.co.uk
-            
-            # Pull down the fresh image we just built and restart gracefully
-            docker compose pull
-            docker compose up -d --remove-orphans
\ No newline at end of file