Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev

Jenkinsfile

@@ -101,7 +101,7 @@ pipeline {
                     steps {
                         withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) {
                             sh 'docker-compose pull'
-                            sh 'docker-compose up -d'
+                            sh 'docker-compose up -d --scale back=3'
                         }
                     }
                 }
@@ -112,7 +112,7 @@ pipeline {
                     steps {
                         withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) {
                             sh 'docker-compose pull'
-                            sh 'docker-compose up -d'
+                            sh 'docker-compose up -d --scale back=3'
                         }
                     }
                 }
@@ -129,8 +129,10 @@ pipeline {
     }
     post {
         always {
-            // junit '*/junit.xml'
             script {
+                if (env.BRANCH_NAME == 'dev')
+                    junit '*/junitresults.xml'
+
                 if (!env.GIT_COMMITTER_EMAIL) return
                 try {
                     mail(

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.5'
 services:
-    app:
-        image: registry.verdnatura.es/salix-app:${TAG}
+    front:
+        image: registry.verdnatura.es/salix-front:${TAG}
         restart: unless-stopped
         build:
             context: .
@@ -9,9 +9,9 @@ services:
         ports:
             - ${PORT}:80
         links:
-            - api
-    api:
-        image: registry.verdnatura.es/salix-api:${TAG}
+            - back
+    back:
+        image: registry.verdnatura.es/salix-back:${TAG}
         restart: unless-stopped
         build: .
         environment:

front/nginx.conf

@@ -1,22 +1,25 @@
 
+upstream back {
+	server back_1:3000;
+	server back_2:3000;
+	server back_3:3000;
+}
 server {
 	listen        80 default_server;
 	listen        [::]:80 default_server;
 	server_name   _;
 	autoindex     off;
 
-	root /usr/share/nginx/html;
+	root /salix/dist;
 	error_page 404 = @notfound;
 
 	location @notfound {
 		return 302 /;
 	}
 	location ~ ^(/[a-zA-Z0-9_-]+)?/(?<path>api(/.*)?)$ {
-		resolver 127.0.0.11;
-		proxy_pass http://api:3000/$path$is_args$args;
+		proxy_pass http://back/$path$is_args$args;
 	}
-	location ~ ^(?:/(.*))?$ {
-		alias /salix/dist/$1;
+	location / {
 		autoindex on;
 	}
 }

front/package.json

@@ -1,11 +1,12 @@
 {
-	"name": "salix-client",
+	"name": "salix-front",
 	"version": "1.0.0",
-	"description": "Salix client",
+    "author": "Verdnatura Levante SL",
+	"description": "Salix frontend",
 	"license": "GPL-3.0",
 	"repository": {
 		"type": "git",
-		"url": "https://git.verdnatura.es/salix"
+		"url": "https://gitea.verdnatura.es/verdnatura/salix"
 	},
 	"dependencies": {
 		"@babel/polyfill": "^7.2.5",

karma.conf.js

@@ -119,7 +119,7 @@ module.exports = function(config) {
             singleRun: true,
             reporters: ['dots', 'junit'],
             junitReporter: {
-                outputFile: 'junit.xml'
+                outputFile: 'junitresults.xml'
             }
         });
     }

package.json

@@ -1,9 +1,13 @@
 {
-    "name": "salix-app",
+    "name": "salix-back",
     "version": "1.0.0",
     "author": "Verdnatura Levante SL",
-    "description": "Salix application",
+    "description": "Salix backend",
     "license": "GPL-3.0",
+	"repository": {
+		"type": "git",
+		"url": "https://gitea.verdnatura.es/verdnatura/salix"
+	},
     "dependencies": {
         "compression": "^1.7.3",
         "fs-extra": "^5.0.0",
@@ -78,10 +82,6 @@
         "webpack-merge": "^4.2.1",
         "yaml-loader": "^0.5.0"
     },
-    "repository": {
-        "type": "git",
-        "url": "https://git.verdnatura.es/salix"
-    },
     "scripts": {
         "test": "nodemon -q back/tests.js -w modules",
         "dbtest": "nodemon -q services/db/tests.js -w services/db/tests",