Merge branch 'test' into 0000-mergeWithTest

Dockerfile

@@ -12,7 +12,6 @@ RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         nodejs \
     && apt-get purge -y --auto-remove \
-        curl \
         gnupg2 \
     && rm -rf /var/lib/apt/lists/* \
     && npm -g install pm2
@@ -33,4 +32,7 @@ COPY \
     README.md \
     ./
 
-CMD ["pm2-docker", "./loopback/server/server.js"]
+CMD ["pm2-runtime", "./back/process.yml"]
+
+HEALTHCHECK --interval=1m --timeout=10s \
+    CMD curl -f http://localhost:3000/api/Applications/status || exit 1

Jenkinsfile

@@ -6,13 +6,15 @@ pipeline {
         disableConcurrentBuilds()
     }
     environment {
-        PROJECT_NAME   = 'salix'
+        PROJECT_NAME      = 'salix'
-        REGISTRY       = 'registry.verdnatura.es'
+        REGISTRY          = 'registry.verdnatura.es'
-        DOCKER_HOST_1  = 'vch1.verdnatura.es'
+        DOCKER_HOST_1     = 'vch1.verdnatura.es'
-        DOCKER_HOST_2  = 'vch2.verdnatura.es'
+        DOCKER_HOST_2     = 'vch2.verdnatura.es'
-        PORT_MASTER    = '5002'
+        PORT_MASTER_FRONT = '5002'
-        PORT_TEST      = '5001'
+        PORT_MASTER_BACK  = '3001-3002'
-        TAG            = "${env.BRANCH_NAME}"
+        PORT_TEST_FRONT   = '5001'
+        PORT_TEST_BACK    = '4001-4002'
+        TAG               = "${env.BRANCH_NAME}"
     }
     stages {
         stage('Checkout') {
@@ -31,10 +33,12 @@ pipeline {
 
                     switch (env.BRANCH_NAME) {
                         case 'master':
-                            env.PORT = PORT_MASTER
+                            env.PORT_FRONT = PORT_MASTER_FRONT
+                            env.PORT_BACK = PORT_MASTER_BACK
                             break
                         case 'test':
-                            env.PORT = PORT_TEST
+                            env.PORT_FRONT = PORT_TEST_FRONT
+                            env.PORT_BACK = PORT_TEST_BACK
                             break
                     }
                     switch (env.BRANCH_NAME) {

back/process.yml

@@ -0,0 +1,5 @@
+apps:
+  - script: ./loopback/server/server.js
+    name: salix-back
+    instances: 1
+    max_restarts: 5

docker-compose.yml

@@ -7,13 +7,15 @@ services:
             context: .
             dockerfile: front/Dockerfile
         ports:
-            - ${PORT}:80
+            - ${PORT_FRONT}:80
         links:
             - back
     back:
         image: registry.verdnatura.es/salix-back:${TAG}
         restart: unless-stopped
         build: .
+        ports:
+            - ${PORT_BACK}:3000
         environment:
             - NODE_ENV
         volumes:

front/nginx.conf

@@ -1,16 +1,4 @@
 
-set_real_ip_from 0.0.0.0/0;
-real_ip_header X-Forwarded-For;
-log_format upstreamlog
-	'[$time_local] $remote_addr -> $proxy_host:$upstream_addr '
-	'"$request" $status $body_bytes_sent '
-	'"$http_referer" "$http_user_agent"';
-access_log  /var/log/nginx/access.log upstreamlog;
-
-upstream back {
-	server back_1:3000;
-	server back_2:3000;
-}
 server {
 	listen        80 default_server;
 	listen        [::]:80 default_server;
@@ -24,9 +12,6 @@ server {
 	location @notfound {
 		return 302 /;
 	}
-	location ~ ^(/[a-zA-Z0-9_-]+)?/(?<path>api(/.*)?)$ {
-		proxy_pass http://back/$path$is_args$args;
-	}
 	location / {
 		autoindex on;
 	}

loopback/common/models/vn-model.js

@@ -20,7 +20,7 @@ module.exports = function(Self) {
                 this.beginTransaction = function(options, cb) {
                     options = options || {};
                     if (!options.timeout)
-                        options.timeout = 30000;
+                        options.timeout = 120000;
                     return orgBeginTransaction.call(this, options, cb);
                 };
             });