diff --git a/Jenkinsfile b/Jenkinsfile index d349252..53258f2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,6 +3,7 @@ pipeline{ stages{ stage('Checkout') { steps { + deleteDir() git url: 'https://github.com/emil28092005/shagram.git', branch: 'main' } } @@ -22,9 +23,9 @@ pipeline{ steps { echo 'Deploying...' sh ''' - docker-compose down || true - docker-compose up -d - docker-compose ps + docker compose down || true + docker compose up -d + docker compose ps ''' } } diff --git a/docker-compose-jenkins.yml b/docker-compose-jenkins.yml index 33812ea..1296a79 100644 --- a/docker-compose-jenkins.yml +++ b/docker-compose-jenkins.yml @@ -6,9 +6,10 @@ services: - "8080:8080" - "50000:50000" volumes: - - jenkins_home:/var/jenkins_home - /var/run/docker.sock:/var/run/docker.sock - /usr/bin/docker:/usr/bin/docker + - /usr/libexec/docker/cli-plugins:/usr/libexec/docker/cli-plugins:ro + - jenkins_home:/var/jenkins_home - /opt/shagram:/workspace environment: - DOCKER_HOST=unix:///var/run/docker.sock