Try fixing Jenkins.

This commit is contained in:
emil28092005
2026-01-17 22:40:55 +00:00
parent 1e29b2e624
commit ce46878054
2 changed files with 51 additions and 43 deletions
Vendored
+31 -22
View File
@@ -1,44 +1,53 @@
pipeline{ pipeline {
agent { label 'docker' } agent { label 'docker' }
options { options { skipDefaultCheckout() }
skipDefaultCheckout()
}
environment { environment {
PROJECT_DIR = "/opt/shagram/shagram"
IMAGE_NAME = "shagram" IMAGE_NAME = "shagram"
DEPLOY_DIR = "/opt/shagram/shagram/deploy/shagram"
COMPOSE_FILE = "/opt/shagram/shagram/deploy/shagram/compose.yaml"
} }
stages{
stages {
stage('Checkout') { stage('Checkout') {
steps { steps {
dir(env.PROJECT_DIR) { script {
deleteDir() deleteDir()
git url: 'https://github.com/emil28092005/shagram.git', branch: 'main'
def scmVars = git url: 'https://github.com/emil28092005/shagram.git', branch: 'cicd-fix'
env.IMAGE_TAG = scmVars.GIT_COMMIT.take(7)
} }
} }
} }
stage('Build') { stage('Build') {
steps { steps {
dir(env.PROJECT_DIR) { sh 'docker build -t ${IMAGE_NAME}:${IMAGE_TAG} .'
echo 'Building shagram...' }
sh 'docker build -t ${IMAGE_NAME}:${GIT_COMMIT} .' }
}
}
}
stage('Test') { stage('Test') {
steps { steps {
echo 'Testing...' sh 'docker run --rm ${IMAGE_NAME}:${IMAGE_TAG} sqlite3 --version'
sh 'docker run --rm ${IMAGE_NAME}:${GIT_COMMIT} sqlite3 --version'
} }
} }
stage('Deploy') { stage('Deploy') {
steps { steps {
dir("${PROJECT_DIR}/deploy/shagram") { sh '''
echo 'Deploying...' set -e
sh 'printf "APP_IMAGE=%s\\n" "${IMAGE_NAME}:${GIT_COMMIT}" > .env' printf "APP_IMAGE=%s\\n" "${IMAGE_NAME}:${IMAGE_TAG}" > "${DEPLOY_DIR}/.env"
sh 'docker compose up -d'
sh 'docker compose ps' docker compose \
} --project-directory "${DEPLOY_DIR}" \
-f "${COMPOSE_FILE}" \
up -d --build
docker compose \
--project-directory "${DEPLOY_DIR}" \
-f "${COMPOSE_FILE}" \
ps
'''
} }
} }
} }
-1
View File
@@ -11,7 +11,6 @@ services:
jenkins-agent-docker: jenkins-agent-docker:
image: jenkins/inbound-agent:latest-jdk17 image: jenkins/inbound-agent:latest-jdk17
container_name: jenkins-agent-docker container_name: jenkins-agent-docker
user: "0:0"
environment: environment:
- JENKINS_URL=http://jenkins-controller:8080 - JENKINS_URL=http://jenkins-controller:8080
- JENKINS_AGENT_NAME=docker-agent - JENKINS_AGENT_NAME=docker-agent