8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
2 changed files with 8 additions and 6 deletions
Showing only changes of commit bfddbfaa22 - Show all commits

2
Jenkinsfile vendored
View File

@ -217,6 +217,7 @@ pipeline {
VERSION = readFile 'VERSION.txt'
}
steps {
script {
def services = ['front', 'back', 'db']
services.each { service ->
sh "docker tag ${REGISTRY}/salix-${service}:${VERSION} ${REGISTRY}/salix-${service}:${env.NODE_ENV}"
@ -225,6 +226,7 @@ pipeline {
sh 'docker-compose push'
}
}
}
stage('Deploy') {
when {
expression { PROTECTED_BRANCH }

View File

@ -10,7 +10,7 @@ services:
context: .
dockerfile: back/Dockerfile
db:
image: registry.verdnatura.es/salix-db:${VERSION:?}
image: registry.verdnatura.es/salix-db:${NODE_ENV:?}
build:
context: .
dockerfile: db/Dockerfile