From f78b6103e1a6e2e4637a2b76c5dd393abd3228ee Mon Sep 17 00:00:00 2001
From: warringtond <warringtond3@gmail.com>
Date: Wed, 3 Jun 2026 17:42:52 -0400
Subject: [PATCH] jenkins deploy update

---
 Caddyfile   |  2 +-
 Dockerfile  | 12 ++++++++++++
 Jenkinsfile | 19 +++++++++++++++++--
 3 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Caddyfile b/Caddyfile
index 03a03bf..ab6c9be 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -1,5 +1,5 @@
 :80 {
 	root * /usr/share/caddy
 	file_server
-	try_files {path} /index.html
+	try_files {path} {path}.html /index.html
 }
diff --git a/Dockerfile b/Dockerfile
index c7c7054..ffe159c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,6 +5,18 @@ RUN npm ci --ignore-scripts
 
 FROM node:20-alpine AS builder
 WORKDIR /app
+ARG VITE_FIREBASE_API_KEY
+ARG VITE_FIREBASE_AUTH_DOMAIN
+ARG VITE_FIREBASE_PROJECT_ID
+ARG VITE_FIREBASE_STORAGE_BUCKET
+ARG VITE_FIREBASE_MESSAGING_SENDER_ID
+ARG VITE_FIREBASE_APP_ID
+ENV VITE_FIREBASE_API_KEY=$VITE_FIREBASE_API_KEY
+ENV VITE_FIREBASE_AUTH_DOMAIN=$VITE_FIREBASE_AUTH_DOMAIN
+ENV VITE_FIREBASE_PROJECT_ID=$VITE_FIREBASE_PROJECT_ID
+ENV VITE_FIREBASE_STORAGE_BUCKET=$VITE_FIREBASE_STORAGE_BUCKET
+ENV VITE_FIREBASE_MESSAGING_SENDER_ID=$VITE_FIREBASE_MESSAGING_SENDER_ID
+ENV VITE_FIREBASE_APP_ID=$VITE_FIREBASE_APP_ID
 COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 RUN npm run build
diff --git a/Jenkinsfile b/Jenkinsfile
index 0deb628..3cfd893 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -9,6 +9,12 @@ pipeline {
     SUBDIR         = ''
     COMPOSE_FILE   = 'docker-compose.yml'
     SERVICE_NAME   = 'whsfund'
+    VITE_FIREBASE_API_KEY = 'AIzaSyAA7nmvia_CrPUnbong7xTF7vcoRdhXbyw'
+    VITE_FIREBASE_AUTH_DOMAIN = 'whsfund-c5e40.firebaseapp.com'
+    VITE_FIREBASE_PROJECT_ID = 'whsfund-c5e40'
+    VITE_FIREBASE_STORAGE_BUCKET = 'whsfund-c5e40.firebasestorage.app'
+    VITE_FIREBASE_MESSAGING_SENDER_ID = '395581871999'
+    VITE_FIREBASE_APP_ID = '1:395581871999:web:919c94680146e45fd06c4a'
   }
 
   stages {
@@ -22,9 +28,18 @@ pipeline {
       steps {
         script {
           docker.withRegistry("https://${REGISTRY}", CREDENTIALS_ID) {
+            def firebaseBuildArgs = [
+              "--build-arg VITE_FIREBASE_API_KEY=${env.VITE_FIREBASE_API_KEY}",
+              "--build-arg VITE_FIREBASE_AUTH_DOMAIN=${env.VITE_FIREBASE_AUTH_DOMAIN}",
+              "--build-arg VITE_FIREBASE_PROJECT_ID=${env.VITE_FIREBASE_PROJECT_ID}",
+              "--build-arg VITE_FIREBASE_STORAGE_BUCKET=${env.VITE_FIREBASE_STORAGE_BUCKET}",
+              "--build-arg VITE_FIREBASE_MESSAGING_SENDER_ID=${env.VITE_FIREBASE_MESSAGING_SENDER_ID}",
+              "--build-arg VITE_FIREBASE_APP_ID=${env.VITE_FIREBASE_APP_ID}"
+            ].join(' ')
+
             def buildArgs = (!env.SUBDIR || env.SUBDIR.trim() == '')
-              ? "-f Dockerfile ."
-              : "-f ${env.SUBDIR}/Dockerfile ${env.SUBDIR}"
+              ? "-f Dockerfile ${firebaseBuildArgs} ."
+              : "-f ${env.SUBDIR}/Dockerfile ${firebaseBuildArgs} ${env.SUBDIR}"
 
             def img = docker.build("${REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}", buildArgs)
             img.push()