diff --git a/Jenkinsfile b/Jenkinsfile index 2bfeede..c9830b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,6 +4,7 @@ pipeline { agent any environment { PROJECT_NAME = 'worker-time-control' + STACK_NAME = "${env.PROJECT_NAME}-${env.BRANCH_NAME}" } stages { stage('Checkout') { @@ -24,7 +25,7 @@ pipeline { DOCKER_HOST = "${env.SWARM_HOST}" } steps { - sh "docker stack deploy --with-registry-auth --prune --compose-file docker-compose.yml ${env.PROJECT_NAME}" + sh "docker stack deploy --with-registry-auth --prune --compose-file docker-compose.yml ${env.STACK_NAME}" } } } diff --git a/docker-compose.yml b/docker-compose.yml index 5d9e248..a00e8e0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,4 +16,4 @@ services: configs: config: external: true - name: worker-time-control_config + name: worker-time-control_${BRANCH_NAME:?}_config