From 109361a7621754ab464bfc6c3addc111a2278f28 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Thu, 19 Dec 2019 14:31:02 +0100
Subject: [PATCH 1/3] Jenkinsfile fixes

---
 Jenkinsfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 718582630e..a85b276a0d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -110,10 +110,8 @@ pipeline {
             environment {
                 DOCKER_TLS_VERIFY = 1
             }
-            parallel {
-                steps {
-                    sh "docker stack deploy --compose-file docker-compose.yml ${env.STACK_NAME}"
-                }
+            steps {
+                sh "docker stack deploy --compose-file docker-compose.yml ${env.STACK_NAME}"
             }
         }
         stage('Database') {

From 441f76a1c162b1ef582b2015c65107b6a7857437 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Thu, 19 Dec 2019 14:38:39 +0100
Subject: [PATCH 2/3] Jenkinsfile fixes

---
 Jenkinsfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a85b276a0d..c238e452c2 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -107,9 +107,6 @@ pipeline {
                 branch 'test'
                 branch 'master'
             }}
-            environment {
-                DOCKER_TLS_VERIFY = 1
-            }
             steps {
                 sh "docker stack deploy --compose-file docker-compose.yml ${env.STACK_NAME}"
             }

From 592b67249383f230185baf7925812946cd8c2a04 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Thu, 19 Dec 2019 14:53:17 +0100
Subject: [PATCH 3/3] Compose now configuration is read from shared storage

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b04ecd0fbc..c9011bdf42 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
         environment:
             - NODE_ENV
         volumes:
-            - /containers/salix:/etc/salix
+            - /mnt/storage/containers/salix:/etc/salix
             - /mnt/storage/pdfs:/var/lib/salix/pdfs
             - /mnt/storage/dms:/var/lib/salix/dms
         deploy: