verdnatura/salix
verdnatura
/
salix
3
5
Fork 0
Code Issues Pull Requests 65 Releases Wiki Activity

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

This commit is contained in:
Carlos 2017-09-05 16:16:51 +02:00
parent e2d1103607 7323d77f59
commit e24a36aa08
2 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -50,7 +50,7 @@ node {
echo "${returnDocker}"; echo "${returnDocker}";
returnDocker = sh (script: "docker rm ${prefixDocker}-${element}", returnStdout: false).trim(); returnDocker = sh (script: "docker rm ${prefixDocker}-${element}", returnStdout: false).trim();
//echo "${returnDocker}"; //echo "${returnDocker}";
//returnDocker = sh (script: "docker rmi ${prefixDocker}-${element}:${buildNumber-3}", returnStdout: true).trim(); returnDocker = sh (script: "docker rmi ${prefixDocker}-${element}:${buildNumber-3}", returnStdout: true).trim();
echo "borran ${prefixDocker}-${element}:${buildNumber-3}"; echo "borran ${prefixDocker}-${element}:${buildNumber-3}";
//echo "${returnDocker}"; //echo "${returnDocker}";
}catch(Exception _){ }catch(Exception _){

40
docker-compose.yml
View File

@ -1,12 +1,8 @@
version: '2' version: '3'
environment:
- branchName=${env.BRANCH_NAME}
- NODE_ENV=
- dockerHost=
services: services:
auth: auth:
container_name: ${branchName}-auth container_name: "${BRANCH_NAME}-auth"
docker_host: ${dockerHost} image: "auth:${TAG}"
build: build:
context: ./services/auth context: ./services/auth
expose: expose:
@ -15,8 +11,8 @@ services:
- "3000:3000" - "3000:3000"
salix: salix:
container_name: ${branchName}-salix container_name: "${BRANCH_NAME}-salix"
docker_host: ${dockerHost} image: "salix:${TAG}"
build: build:
context: ./services/salix context: ./services/salix
expose: expose:
@ -25,8 +21,8 @@ services:
- "3001:3001" - "3001:3001"
client: client:
container_name: ${branchName}-client container_name: "${BRANCH_NAME}-client"
docker_host: ${dockerHost} image: "client:${TAG}"
build: build:
context: ./services/client context: ./services/client
expose: expose:
@ -35,8 +31,8 @@ services:
- "3002:3002" - "3002:3002"
mailer: mailer:
container_name: ${branchName}-mailer container_name: "${BRANCH_NAME}-mailer"
docker_host: ${dockerHost} image: "mailer:${TAG}"
build: build:
context: ./services/mailer context: ./services/mailer
expose: expose:
@ -45,8 +41,8 @@ services:
- "3003:3003" - "3003:3003"
production: production:
container_name: ${branchName}-production container_name: "${BRANCH_NAME}-production"
docker_host: ${dockerHost} image: "production:${TAG}"
build: build:
context: ./services/production context: ./services/production
expose: expose:
@ -55,15 +51,15 @@ services:
- "3004:3004" - "3004:3004"
nginx: nginx:
container_name: ${branchName}-nginx container_name: "${BRANCH_NAME}-nginx"
docker_host: ${dockerHost} image: "nginx:${TAG}"
build: build:
context: ./services/nginx context: ./services/nginx
ports: ports:
- "80:8080" - "80:8080"
links: links:
- "auth:${branchName}-auth" - "auth:"${BRANCH_NAME}-auth"
- "salix:${branchName}-salix" - "salix:"${BRANCH_NAME}-salix"
- "client:${branchName}-client" - "client:"${BRANCH_NAME}-client"
- "mailer:${branchName}-mailer" - "mailer:"${BRANCH_NAME}-mailer"
- "production:${branchName}-production" - "production:"${BRANCH_NAME}-production"