From 0d440132caaf3d26b55c09405229088e4f1aba99 Mon Sep 17 00:00:00 2001
From: Finley Ghosh <finley@springup.software>
Date: Wed, 23 Jul 2025 20:17:47 +1000
Subject: [PATCH] Minor fixes"

---
 deploy/deploy-stg.sh   | 21 +++++++++++++++++----
 docker-compose.stg.yml |  1 -
 2 files changed, 17 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 deploy/deploy-stg.sh

diff --git a/deploy/deploy-stg.sh b/deploy/deploy-stg.sh
old mode 100644
new mode 100755
index c1dc70e4..35a7476b
--- a/deploy/deploy-stg.sh
+++ b/deploy/deploy-stg.sh
@@ -1,22 +1,29 @@
 #!/bin/bash
 # Deploy staging environment for cmc-sales
 
+echo "Starting staging deployment for cmc-sales..."
 # Variables (edit these as needed)
+echo "Setting variables..."
 SERVER="cmc"
-REPO="code.springupsoftware.com/cmc/cmc-sales.git"
+REPO="git@code.springupsoftware.com:cmc/cmc-sales.git"
 BRANCH="stg"
 STAGING_DIR="cmc-sales-staging"
-
-# SSH and deploy
-ssh $SERVER << 'ENDSSH'
+    
+echo "Connecting to server $SERVER via SSH..."
+# Pass variables into SSH session
+ssh $SERVER \
+  "SERVER=$SERVER REPO='$REPO' BRANCH='$BRANCH' STAGING_DIR='$STAGING_DIR' bash -s" << 'ENDSSH'
   set -e
+  echo "Connected to $SERVER."
   # Clone or update staging branch
   if [ -d "$STAGING_DIR" ]; then
+    echo "Updating existing staging directory $STAGING_DIR..."
     cd "$STAGING_DIR"
     git fetch origin
     git checkout $BRANCH
     git pull origin $BRANCH
   else
+    echo "Cloning repository $REPO to $STAGING_DIR..."
     git clone -b $BRANCH $REPO $STAGING_DIR
     cd "$STAGING_DIR"
   fi
@@ -24,6 +31,7 @@ ssh $SERVER << 'ENDSSH'
     # Create .env file for go-app if it doesn't exist
   ENV_PATH="/home/cmc/$STAGING_DIR/go-app/.env"
   if [ ! -f "$ENV_PATH" ]; then
+    echo "Creating .env file for go-app..."
     cat > "$ENV_PATH" <<'ENVEOF'
 # Environment variables for Go app mail configuration
 SMTP_HOST="host.docker.internal"
@@ -34,12 +42,15 @@ SMTP_FROM="CMC Sales <sales@cmctechnologies.com.au>"
 ENVEOF
   fi
 
+  echo "Starting docker compose for staging..."
   # Start docker compose (edit file name if needed)
   docker compose -f docker-compose.yml -f docker-compose.stg.yml up -d
 
+  echo "Checking running containers..."
   # Check containers
   docker compose ps
 
+  echo "Creating sync script for staging directories..."
   # Create sync script for staging dirs
   cat > /home/cmc/sync_prod_to_staging.sh <<'EOF'
 #!/bin/bash
@@ -50,7 +61,9 @@ rsync -a --delete /mnt/vault/vaultmsgs/ /home/cmc/cmc-sales-staging/vault/vaultm
 EOF
   chmod +x /home/cmc/sync_prod_to_staging.sh
 
+  echo "Ensuring cron job for sync script is present..."
   # Add cron job if not present
   (crontab -l 2>/dev/null | grep -q '/home/cmc/sync_prod_to_staging.sh') || \
     (crontab -l 2>/dev/null; echo '0 3 * * * /home/cmc/sync_prod_to_staging.sh') | crontab -
+  echo "Deployment complete."
 ENDSSH
diff --git a/docker-compose.stg.yml b/docker-compose.stg.yml
index df69ebfd..d8724e65 100644
--- a/docker-compose.stg.yml
+++ b/docker-compose.stg.yml
@@ -17,7 +17,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile_stg
-    platform: linux/amd64
     container_name: cmc-stg-php
     depends_on:
       - cmc-stg-db