Jenkinsfile

@@ -76,7 +76,7 @@ pipeline {
                     def packageJson = readJSON file: 'package.json'
                     def version = "${packageJson.version}-build${env.BUILD_ID}"
                     writeFile(file: 'VERSION.txt', text: version)
-                    echo "VERSION.txt: ${version}"
+                    echo "VERSION: ${version}"
                 }
             }
         }
@@ -109,39 +109,6 @@ pipeline {
                 }
             }
         }
-        stage('Build') {
-            when {
-                expression { RUN_BUILD }
-            }
-            environment {
-                VERSION = readFile 'VERSION.txt'
-                CREDENTIALS = credentials('docker-registry')
-            }
-            parallel {
-                stage('Back') {
-                    steps {
-                        dockerBuildPush 'salix-back', '.', 'back/Dockerfile'
-                    }
-                }
-                stage('Front') {
-                    steps {
-                        sh 'gulp build'
-                        dockerBuildPush 'salix-front', 'front'
-                    }
-                }
-                stage('DB') {
-                    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'
-                        sh 'docker rm vn-database'
-
-                        dockerBuildPush 'salix-db', 'db'
-                    }
-                }
-            }
-        }
         stage('Test') {
             when {
                 expression { RUN_TESTS }
@@ -178,6 +145,38 @@ pipeline {
                 }
             }
         }
+        stage('Build') {
+            when {
+                expression { RUN_BUILD }
+            }
+            environment {
+                VERSION = readFile 'VERSION.txt'
+                CREDENTIALS = credentials('docker-registry')
+            }
+            parallel {
+                stage('Back') {
+                    steps {
+                        dockerBuildPush 'salix-back', '.', 'back/Dockerfile'
+                    }
+                }
+                stage('Front') {
+                    steps {
+                        sh 'gulp build'
+                        dockerBuildPush 'salix-front', 'front'
+                    }
+                }
+                stage('DB') {
+                    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'
+                        sh 'docker rm vn-database'
+                        dockerBuildPush 'salix-db', 'db'
+                    }
+                }
+            }
+        }
         stage('Deploy') {
             when {
                 expression { PROTECTED_BRANCH }