#814 Docker deploy fixes

Jenkinsfile

@@ -36,6 +36,10 @@ node {
             env.COMPOSE_PROJECT_NAME = 'salix'
             env.DOCKER_TLS_VERIFY = 1
 
+            if (env.BRANCH_NAME != 'master') {
+                env.COMPOSE_PROJECT_NAME = '${env.BRANCH_NAME}-salix'
+            }
+
             env.DOCKER_HOST = 'tcp://vch2.verdnatura.es:2376';
             sh "docker-compose up -d"
         }

docker-compose.yml

@@ -5,18 +5,16 @@ services:
             context: .
             dockerfile: services/nginx/Dockerfile
         ports:
-            - 5000:80
+            - 80:80
         image: salix:latest
         restart: unless-stopped
         links:
             - api
     api:
         build: .
-        ports:
-            - 3001-3003:3000
         environment:
             NODE_ENV: test
         restart: unless-stopped
         image: salix-api
         volumes:
-            - /config:/config
+            - /salix:/etc/salix