diff --git a/Jenkinsfile b/Jenkinsfile index 62248b0fee..4ba0a8f872 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,11 +43,13 @@ node stage ("Stopping/Removing Docker") { + env.TAG = "${env.BUILD_NUMBER}-1"; sh "docker-compose down --rmi 'all'" } stage ("Generar dockers") { + env.TAG = "${env.BUILD_NUMBER}+1"; sh "docker-compose up -d --build" } } diff --git a/docker-compose.yml b/docker-compose.yml index 949d393aeb..b8d64389b3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -76,7 +76,18 @@ services: - "3005" ports: - "3005:3005" - + print: + environment: + - NODE_ENV=${NODE_ENV} + container_name: "${BRANCH_NAME}-print" + image: "print:${TAG}" + build: + context: ./services + dockerfile: /print/Dockerfile + expose: + - "3006" + ports: + - "3006:3006" nginx: container_name: "${BRANCH_NAME}-nginx" image: "nginx:${TAG}" @@ -95,3 +106,4 @@ services: - "mailer:${BRANCH_NAME}-mailer" - "production:${BRANCH_NAME}-production" - "route:${BRANCH_NAME}-route" + - "print:${BRANCH_NAME}-print" diff --git a/services/mailer/application/auth.js b/services/mailer/application/auth.js index 81f423e15d..7e9457537f 100644 --- a/services/mailer/application/auth.js +++ b/services/mailer/application/auth.js @@ -36,13 +36,13 @@ module.exports = { let host = this.request.headers.host.split(':')[0]; let proxy; - if (host == '127.0.0.1') + if (host == '127.0.0.1') proxy = config.proxy.localhost; - else if(process.env.NODE_ENV == 'production') + else if (process.env.NODE_ENV == 'production') proxy = config.proxy.salix; - else if(process.env.NODE_ENV == 'development') + else if (process.env.NODE_ENV == 'development') proxy = config.proxy.testSalix; - + this.request.proxyHost = `http://${proxy.host}:${proxy.port}`; this.request.user = { id: token.userId, diff --git a/services/mailer/application/config.js b/services/mailer/application/config.js index 1b78e36cec..1442e85edb 100644 --- a/services/mailer/application/config.js +++ b/services/mailer/application/config.js @@ -9,7 +9,7 @@ try { config = Object.assign(require(configPath), require(devConfigPath)); } catch (e) { if (e.code == 'MODULE_NOT_FOUND') - return require(configPath); + config = require(configPath); } config.proxy = require('../../nginx/config.json'); diff --git a/services/print/Dockerfile b/services/print/Dockerfile new file mode 100644 index 0000000000..2e8bdc43bc --- /dev/null +++ b/services/print/Dockerfile @@ -0,0 +1,13 @@ +FROM node:6.9.1 + +COPY . /app + +WORKDIR /app + +RUN npm install + +RUN npm -g install pm2 + +CMD ["pm2-docker", "./server/server.js"] + +EXPOSE 3006 diff --git a/services/print/application/config.js b/services/print/application/config.js index 1b78e36cec..1442e85edb 100644 --- a/services/print/application/config.js +++ b/services/print/application/config.js @@ -9,7 +9,7 @@ try { config = Object.assign(require(configPath), require(devConfigPath)); } catch (e) { if (e.code == 'MODULE_NOT_FOUND') - return require(configPath); + config = require(configPath); } config.proxy = require('../../nginx/config.json');