verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 68 Releases Wiki Activity

8713-testToMaster #3523

Merged
alexm merged 383 commits from 8713-testToMaster into master 2025-03-04 06:52:15 +00:00
Conversation 0 Commits 383 Files Changed 108 +8 -6
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bfddbfaa22 - Show all commits

2
Jenkinsfile vendored
View File

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

2
docker-compose.yml
View File

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