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 +13 -14
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 17410202ad - Show all commits

23
Jenkinsfile vendored
View File

@ -156,23 +156,23 @@ pipeline {
parallel { parallel {
stage('Back') { stage('Back') {
steps { steps {
dockerBuildPush 'salix-back', '.', 'back/Dockerfile' dockerBuild 'salix-back', '.', 'back/Dockerfile'
} }
} }
stage('Front') { stage('Front') {
steps { steps {
sh 'gulp build' sh 'gulp build'
dockerBuildPush 'salix-front', 'front' dockerBuild 'salix-front', 'front'
} }
} }
stage('DB') { stage('DB') {
steps { steps {
sh 'npx myt run -t' sh 'npx myt run -t'
sh 'docker exec vn-database sh -c "cp -r /var/lib/mysql /data"' sh 'docker exec vn-database sh -c "rm -rf /mysql-template"'
sh 'docker commit vn-database vn_db' sh 'docker exec vn-database sh -c "cp -a /var/lib/mysql /mysql-template"'
sh 'docker stop vn-database' sh 'docker commit vn-database salix-tmp-db:$VERSION'
sh 'docker rm vn-database' sh 'docker rm -f vn-database'
dockerBuildPush 'salix-db', 'db' dockerPush docker.image("salix-tmp-db:${VERSION}")
} }
} }
} }
@ -248,13 +248,16 @@ pipeline {
} }
} }
def dockerBuildPush(imageName, context, dockerfile = null) { def dockerBuild(imageName, context, dockerfile = null) {
if (dockerfile == null) if (dockerfile == null)
dockerfile = "${context}/Dockerfile" dockerfile = "${context}/Dockerfile"
docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
def baseImage = "${imageName}:${env.VERSION}" def baseImage = "${imageName}:${env.VERSION}"
def image = docker.build(baseImage, "-f ${dockerfile} ${context}") def image = docker.build(baseImage, "-f ${dockerfile} ${context}")
dockerPush(image)
}
def dockerPush(image) {
docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
image.push() image.push()
image.push(env.BRANCH_NAME) image.push(env.BRANCH_NAME)
if (IS_LATEST) image.push('latest') if (IS_LATEST) image.push('latest')

4
db/Dockerfile
View File

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