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

31
Jenkinsfile vendored
View File

@ -179,6 +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('Push') { stage('Push') {
@ -190,6 +217,10 @@ pipeline {
VERSION = readFile 'VERSION.txt' VERSION = readFile 'VERSION.txt'
} }
steps { steps {
// 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 login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
sh 'docker-compose push' sh 'docker-compose push'
} }

4
db/Dockerfile Normal file
View File

@ -0,0 +1,4 @@
FROM mariadb:10.11.6
ENV TZ Europe/Madrid
COPY --from=vn_db /data /var/lib/mysql
CMD ["mysqld"]

5
docker-compose.yml
View File

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