verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 69 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 +36 -36
2 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4aa56a71cb - Show all commits

62
Jenkinsfile vendored
View File

@ -179,33 +179,33 @@ pipeline {
}
}
}
// stage('Db') {
// when {
// expression { FROM_GIT }
// }
// stages {
// stage('Build') {
// when {
// expression { RUN_BUILD }
// }
// environment {
// VERSION = readFile 'VERSION.txt'
// }
// steps {
// sh 'npx myt run -t'
// sh '''
// docker exec vn-database sh -c "cp -r /var/lib/mysql /data"
// '''
// sh 'docker commit vn-database vn_db'
// sh '''
// docker stop vn-database
// docker rm vn-database
// '''
// sh 'docker-compose build db'
// }
// }
// }
// }
stage('Db') {
when {
expression { FROM_GIT }
}
stages {
stage('Build') {
when {
expression { RUN_BUILD }
}
environment {
VERSION = readFile 'VERSION.txt'
}
steps {
sh 'npx myt run -t'
sh '''
docker exec vn-database sh -c "cp -r /var/lib/mysql /data"
'''
sh 'docker commit vn-database vn_db'
sh '''
docker stop vn-database
docker rm vn-database
'''
sh 'docker-compose build db'
}
}
}
}
}
}
stage('Push') {
@ -217,10 +217,10 @@ pipeline {
VERSION = readFile 'VERSION.txt'
}
steps {
// def services = ['front', 'back', 'db']
// services.each { service ->
// sh "docker tag ${REGISTRY}/salix-${service}:${VERSION} ${REGISTRY}/salix-${service}:${env.NODE_ENV}"
// }
def services = ['front', 'back', 'db']
services.each { service ->
sh "docker tag ${REGISTRY}/salix-${service}:${VERSION} ${REGISTRY}/salix-${service}:${env.NODE_ENV}"
}
sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
sh 'docker-compose push'
}

10
docker-compose.yml
View File

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