From c25952bbc10de69926b0f815d0bbf5840c05278b Mon Sep 17 00:00:00 2001 From: emil28092005 Date: Fri, 16 Jan 2026 23:52:50 +0300 Subject: [PATCH] Try fixing Jenkins --- Jenkinsfile | 9 ++++----- deploy/shagram/compose.yaml | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a67643a..1a4f1de 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,14 +4,13 @@ pipeline{ skipDefaultCheckout() } environment { - SRC_DIR = "/opt/shagram/src/shagram" - DEPLOY_DIR = "/opt/shagram/deploy/shagram" + PROJECT_DIR = "/opt/shagram/shagram" IMAGE_NAME = "shagram" } stages{ stage('Checkout') { steps { - dir(env.SRC_DIR) { + dir(env.PROJECT_DIR) { deleteDir() git url: 'https://github.com/emil28092005/shagram.git', branch: 'main' } @@ -19,7 +18,7 @@ pipeline{ } stage('Build') { steps { - dir(env.SRC_DIR) { + dir(env.PROJECT_DIR) { echo 'Building shagram...' sh 'docker build -t ${IMAGE_NAME}:${GIT_COMMIT} .' @@ -34,7 +33,7 @@ pipeline{ } stage('Deploy') { steps { - dir(env.DEPLOY_DIR) { + dir("${PROJECT_DIR}/deploy/shagram") { echo 'Deploying...' sh 'printf "APP_IMAGE=%s\\n" "${IMAGE_NAME}:${GIT_COMMIT}" > .env' sh 'docker compose up -d' diff --git a/deploy/shagram/compose.yaml b/deploy/shagram/compose.yaml index 560d5f1..6bfe40b 100644 --- a/deploy/shagram/compose.yaml +++ b/deploy/shagram/compose.yaml @@ -2,7 +2,7 @@ services: shagram: image: ${APP_IMAGE:-shagram:local} build: - context: ../../src/shagram + context: ../.. container_name: shagram-app environment: - DATABASE_PATH=/app/data/shagram.db