From ce46878054e6e22492c811c8ecea4fb7c0eaf96d Mon Sep 17 00:00:00 2001
From: emil28092005 <emil28092005@gmail.com>
Date: Sat, 17 Jan 2026 22:40:55 +0000
Subject: [PATCH] Try fixing Jenkins.

---
 Jenkinsfile                | 93 +++++++++++++++++++++-----------------
 infra/jenkins/compose.yaml |  1 -
 2 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 1a4f1de..a8c00d0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,45 +1,54 @@
-pipeline{
-    agent { label 'docker' }
-    options {
-        skipDefaultCheckout()
-    }
-    environment {
-        PROJECT_DIR = "/opt/shagram/shagram"
-        IMAGE_NAME = "shagram"
-    }
-    stages{
-        stage('Checkout') {
-            steps {
-                dir(env.PROJECT_DIR) {
-                    deleteDir()
-                    git url: 'https://github.com/emil28092005/shagram.git', branch: 'main'
-                }
-            }
-        }
-        stage('Build') {
-            steps {
-                dir(env.PROJECT_DIR) { 
-                    echo 'Building shagram...'
-                    sh 'docker build -t ${IMAGE_NAME}:${GIT_COMMIT} .'
+pipeline {
+  agent { label 'docker' }
+  options { skipDefaultCheckout() }
 
-                }
-            }
-        }
-        stage('Test') {
-            steps {
-                echo 'Testing...'
-                sh 'docker run --rm ${IMAGE_NAME}:${GIT_COMMIT} sqlite3 --version'
-            }
-        }
-        stage('Deploy') {
-            steps {
-                dir("${PROJECT_DIR}/deploy/shagram") {
-                    echo 'Deploying...'
-                    sh 'printf "APP_IMAGE=%s\\n" "${IMAGE_NAME}:${GIT_COMMIT}" > .env'
-                    sh 'docker compose up -d'
-                    sh 'docker compose ps'
-                }
-            }
+  environment {
+    IMAGE_NAME   = "shagram"
+    DEPLOY_DIR   = "/opt/shagram/shagram/deploy/shagram"
+    COMPOSE_FILE = "/opt/shagram/shagram/deploy/shagram/compose.yaml"
+  }
+
+  stages {
+    stage('Checkout') {
+      steps {
+        script {
+          deleteDir()
+
+          def scmVars = git url: 'https://github.com/emil28092005/shagram.git', branch: 'cicd-fix'
+          env.IMAGE_TAG = scmVars.GIT_COMMIT.take(7)
         }
+      }
     }
-}
\ No newline at end of file
+
+    stage('Build') {
+      steps {
+        sh 'docker build -t ${IMAGE_NAME}:${IMAGE_TAG} .'
+      }
+    }
+
+    stage('Test') {
+      steps {
+        sh 'docker run --rm ${IMAGE_NAME}:${IMAGE_TAG} sqlite3 --version'
+      }
+    }
+
+    stage('Deploy') {
+      steps {
+        sh '''
+          set -e
+          printf "APP_IMAGE=%s\\n" "${IMAGE_NAME}:${IMAGE_TAG}" > "${DEPLOY_DIR}/.env"
+
+          docker compose \
+            --project-directory "${DEPLOY_DIR}" \
+            -f "${COMPOSE_FILE}" \
+            up -d --build
+
+          docker compose \
+            --project-directory "${DEPLOY_DIR}" \
+            -f "${COMPOSE_FILE}" \
+            ps
+        '''
+      }
+    }
+  }
+}
diff --git a/infra/jenkins/compose.yaml b/infra/jenkins/compose.yaml
index 6f39260..7e1b487 100644
--- a/infra/jenkins/compose.yaml
+++ b/infra/jenkins/compose.yaml
@@ -11,7 +11,6 @@ services:
   jenkins-agent-docker:
     image: jenkins/inbound-agent:latest-jdk17
     container_name: jenkins-agent-docker
-    user: "0:0"
     environment:
       - JENKINS_URL=http://jenkins-controller:8080
       - JENKINS_AGENT_NAME=docker-agent