ci/cd test

Author: xdkaine

app/Jenkinsfile

@@ -2,22 +2,21 @@ pipeline {
     agent any
 
     environment {
-        // host paths
-        PROD_DIR    = "/opt/docker/site"               // where site/compose.yml lives
-        SITE_DIR    = "/opt/docker/site/static-site/app"   // where Dockerfile + app code should live/build from
+        // Host paths (these MUST be mounted into the jenkins container)
+        PROD_DIR     = "/opt/docker/site"             // folder that has compose.yml
+        SITE_DIR     = "/opt/docker/site/static-site" // folder that has Dockerfile + app code
 
-        IMAGE_NAME      = "static-site"
-        IMAGE_LATEST    = "static-site:latest"
-        SERVICE_NAME    = "static-site"
-        CONTAINER_NAME  = "static-site"
+        IMAGE_TAG    = "static-site:latest"           // this must match compose.yml
+        SERVICE_NAME = "static-site"                  // service name in compose.yml
     }
 
+    // safety net in case GitHub webhook doesn't fire
     triggers {
-        // optional: poll main in case webhook fails
         pollSCM('H/5 * * * *')
     }
 
     stages {
+
         stage('Checkout main') {
             when { branch 'main' }
             steps {
@@ -29,45 +28,49 @@ pipeline {
             when { branch 'main' }
             steps {
                 /*
-                 We need the latest app code to be present in /opt/docker/site/static-site
-                 so we can build the image FROM that directory using the host docker daemon.
+                 We want the code Jenkins just checked out
+                 to live in /opt/docker/site/static-site on the HOST,
+                 because that's what we'll build from.
 
-                 rsync copies the checked-out repo (current workspace) into SITE_DIR on the host.
-                 Adjust the source path ("./") if your actual app code is under ./app in git.
+                 NOTE:
+                 - If your app lives in the repo root, keep "./".
+                 - If your app lives in ./app in the repo, change "./" to "./app/".
                 */
                 sh """
                 rsync -a --delete ./ ${SITE_DIR}/
                 """
             }
         }
 
-        stage('Build image on host daemon') {
+        stage('Build Docker image (static-site:latest) on the host daemon') {
             when { branch 'main' }
             steps {
                 /*
-                 Build the Docker image as static-site:latest using the host docker socket.
-                 After this, the host's Docker daemon now has an updated static-site:latest.
+                 This runs *inside* the Jenkins container,
+                 but because /var/run/docker.sock is mounted,
+                 `docker build` is actually talking to the host's Docker engine.
+
+                 Result:
+                 The host now has a fresh static-site:latest image.
                 */
                 sh """
                 cd ${SITE_DIR}
-                docker build -t ${IMAGE_LATEST} -f Dockerfile .
+                docker build -t ${IMAGE_TAG} -f Dockerfile .
                 """
             }
         }
 
-        stage('Redeploy via docker compose') {
+        stage('Deploy / restart running container via docker compose') {
             when { branch 'main' }
             steps {
                 /*
-                 Now tell docker compose (in /opt/docker/site/compose.yml) to recreate the service.
-                 compose.yml MUST define the service like:
-                 
-                 static-site:
-                   image: static-site:latest
-                   container_name: static-site
-                   ...
+                 Now we ask docker compose (the one in /opt/docker/site/compose.yml)
+                 to recreate the service using the new static-site:latest image.
 
-                 and MUST NOT have a 'build:' block anymore.
+                 Requirements:
+                 - /opt/docker/site/compose.yml MUST NOT have a 'build:' block for static-site
+                   (it should ONLY say `image: static-site:latest`)
+                 - /opt/docker/site is mounted into the Jenkins container so this cd works
                 */
                 sh """
                 cd ${PROD_DIR}
@@ -79,10 +82,10 @@ pipeline {
 
     post {
         success {
-            echo "Deploy succeeded. ${IMAGE_LATEST} is now running as ${CONTAINER_NAME}."
+            echo "✅ Deploy succeeded. ${IMAGE_TAG} is now running."
         }
         failure {
-            echo "Deploy failed. Check build logs."
+            echo "❌ Deploy failed. Check build logs."
         }
     }
 }