Move backend from VM to Cloud Run and remove Load Balancer

Both to save lots of $$$

Author: MartinBraquet

.github/workflows/cd-api.yml

@@ -1,7 +1,7 @@
 name: API Release
 on:
   push:
-    branches: [main, master]
+    branches: [ main, master ]
     paths:
       - 'backend/api/package.json'
       - '.github/workflows/cd-api.yml'
@@ -70,17 +70,6 @@ jobs:
       - name: Configure Docker for Artifact Registry
         run: gcloud auth configure-docker us-west1-docker.pkg.dev --quiet
 
-      - name: Install Tofu (Terraform)
-        run: |
-          LATEST=https://github.com/opentofu/opentofu/releases/download/v1.10.5/tofu_1.10.5_linux_amd64.zip
-          curl -LO "$LATEST"
-          unzip -o tofu_*_linux_amd64.zip
-          sudo mv tofu /usr/local/bin/
-          rm tofu_*_linux_amd64.zip
-          echo "OpenTofu version: $(tofu version)"
-          cd backend/api
-          tofu init
-
       - name: Run deploy script
         run: |
           chmod +x backend/api/deploy-api.sh

backend/api/Dockerfile

@@ -4,7 +4,7 @@ FROM node:20-alpine
 WORKDIR /usr/src/app
 
 # Install PM2 globally
-RUN yarn global add pm2
+# RUN yarn global add pm2
 
 # Fet dependencies in for efficient docker layering
 COPY dist/package.json dist/yarn.lock ./
@@ -21,13 +21,15 @@ RUN npm list || true
 COPY dist ./
 
 # Copy the PM2 ecosystem configuration
-COPY ecosystem.config.js ./
+# COPY ecosystem.config.js ./
 
-ENV PORT=80
-EXPOSE 80/tcp
+#ENV PORT=80
+#EXPOSE 80/tcp
 # EXPOSE 8090/tcp
 # EXPOSE 8091/tcp
 # EXPOSE 8092/tcp
 
-# Use PM2 to run the application with the ecosystem config
-CMD ["pm2-runtime", "ecosystem.config.js"]
+# Use PM2 to run the application with the ecosystem config (was only for VM, not cloud run)
+#CMD ["pm2-runtime", "ecosystem.config.js"]
+
+CMD ["node", "-r", "tsconfig-paths/register", "backend/api/lib/serve.js"]

backend/api/deploy-api.sh

@@ -1,14 +1,4 @@
 #!/bin/bash
-
-# steps to deploy new version to GCP:
-# 1. build new docker image & upload to Google
-# 2. create a new GCP instance template with the new docker image
-# 3. tell the GCP 'backend service' for the API to update to the new template
-# 4. a. GCP creates a new instance with the new template
-#    b. wait for the new instance to be healthy (serving TCP connections)
-#    c. route new connections to the new instance
-#    d. delete the old instance
-
 set -e
 
 cd "$(dirname "$0")"
@@ -45,28 +35,21 @@ TIMESTAMP=$(date +"%s")
 IMAGE_TAG="${TIMESTAMP}-${GIT_REVISION}"
 IMAGE_URL="${REGION}-docker.pkg.dev/${PROJECT}/builds/${SERVICE_NAME}:${IMAGE_TAG}"
 
-echo "🚀 Deploying ${SERVICE_NAME} to ${ENV} ($(date "+%Y-%m-%d %I:%M:%S %p"))"
+echo "🚀 Building & Pushing Image..."
 yarn build
-
-gcloud auth print-access-token | docker login -u oauth2accesstoken --password-stdin us-west1-docker.pkg.dev
-docker build . --tag ${IMAGE_URL} --platform linux/amd64 --progress=plain
-echo "docker push ${IMAGE_URL}"
+gcloud auth print-access-token | docker login -u oauth2accesstoken --password-stdin ${REGION}-docker.pkg.dev
+gcloud auth configure-docker ${REGION}-docker.pkg.dev --quiet
+docker build . --tag ${IMAGE_URL} --platform linux/amd64
 docker push ${IMAGE_URL}
 
-export TF_VAR_image_url=$IMAGE_URL
-export TF_VAR_env=$ENV
-tofu apply -auto-approve
-
-#INSTANCE_NAME=$(gcloud compute instances list \
-#  --filter="zone:(us-west1-c)" \
-#  --sort-by="~creationTimestamp" \
-#  --format="value(name)" \
-#  --limit=1)
-#SERVICE_ACCOUNT_EMAIL=$(gcloud compute instances describe ${INSTANCE_NAME} \
-#  --zone us-west1-c \
-#  --format="value(serviceAccounts.email)")
-#gcloud projects add-iam-policy-binding ${PROJECT} \
-#  --member="serviceAccount:$SERVICE_ACCOUNT_EMAIL" \
-#  --role="roles/artifactregistry.reader"
-
-echo "✅ Deployment complete! Image: ${IMAGE_URL}"
+# Update Cloud Run (The fast way)
+# This keeps all the Terraform-defined settings (env vars, memory, etc.)
+# but simply swaps the container image.
+gcloud run deploy ${SERVICE_NAME} \
+  --image ${IMAGE_URL} \
+  --region ${REGION} \
+  --platform managed \
+  --quiet
+
+echo "Custom Domain: https://api.compassmeet.com"
+echo "✅ Code updated on Cloud Run!"

backend/api/deploy-init-api.sh

@@ -0,0 +1,54 @@
+#!/bin/bash
+set -e
+
+cd "$(dirname "$0")"
+
+source ../../.env
+
+ENV=${1:-prod}
+
+# Config
+REGION="us-west1"
+ZONE="us-west1-b"
+
+PROJECT="compass-130ba"
+SERVICE_NAME="api"
+
+GIT_REVISION=$(git rev-parse --short HEAD)
+GIT_COMMIT_DATE=$(git log -1 --format=%ci)
+GIT_COMMIT_AUTHOR=$(git log -1 --format='%an')
+GIT_COMMIT_MESSAGE=$(git log -1 --format='%s')
+echo "Git commit message: ${GIT_COMMIT_MESSAGE}"
+
+cat > metadata.json << EOF
+{
+  "git": {
+    "revision": "${GIT_REVISION}",
+    "commitDate": "${GIT_COMMIT_DATE}",
+    "author": "${GIT_COMMIT_AUTHOR}",
+    "message": "${GIT_COMMIT_MESSAGE}"
+  }
+}
+EOF
+
+TIMESTAMP=$(date +"%s")
+IMAGE_TAG="${TIMESTAMP}-${GIT_REVISION}"
+IMAGE_URL="${REGION}-docker.pkg.dev/${PROJECT}/builds/${SERVICE_NAME}:${IMAGE_TAG}"
+
+echo "🚀 Building & Pushing Image..."
+yarn build
+gcloud auth print-access-token | docker login -u oauth2accesstoken --password-stdin ${REGION}-docker.pkg.dev
+docker build . --tag ${IMAGE_URL} --platform linux/amd64
+docker push ${IMAGE_URL}
+
+echo "Infrastructure Update..."
+export TF_VAR_image_url=$IMAGE_URL
+export TF_VAR_env=$ENV
+tofu apply -auto-approve
+
+# Get the new URL just in case
+SERVICE_URL=$(gcloud run services describe ${SERVICE_NAME} --platform managed --region ${REGION} --format 'value(status.url)')
+
+echo "✅ Deployed to Cloud Run!"
+echo "Service URL: ${SERVICE_URL}"
+echo "Custom Domain: https://api.compassmeet.com"