verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

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

This commit is contained in:
Carlos Jimenez Ruiz 2019-02-07 09:18:48 +01:00
parent eb4e29fb48 f67aee43bd
commit 6a2e4a4b70
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

@ -101,7 +101,7 @@ pipeline {
steps { steps {
withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) { withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) {
sh 'docker-compose pull' sh 'docker-compose pull'
sh 'docker-compose up -d --scale back=3' sh 'docker-compose up -d --scale back=2'
} }
} }
} }
@ -112,7 +112,7 @@ pipeline {
steps { steps {
withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) { withCredentials([dockerCert(credentialsId: 'docker', variable: 'DOCKER_CERT_PATH')]) {
sh 'docker-compose pull' sh 'docker-compose pull'
sh 'docker-compose up -d --scale back=3' sh 'docker-compose up -d --scale back=2'
} }
} }
} }

1
front/nginx.conf
View File

@ -2,7 +2,6 @@
upstream back { upstream back {
server back_1:3000; server back_1:3000;
server back_2:3000; server back_2:3000;
server back_3:3000;
} }
server { server {
listen 80 default_server; listen 80 default_server;

1
print/lib/router.js
View File

@ -16,7 +16,6 @@ module.exports = app => {
app.get(`/api/report/${name}`, (request, response, next) => { app.get(`/api/report/${name}`, (request, response, next) => {
reportEngine.toPdf(name, request).then(stream => { reportEngine.toPdf(name, request).then(stream => {
response.setHeader('Content-Disposition', `attachment; filename="${name}.pdf"`);
response.setHeader('Content-type', 'application/pdf'); response.setHeader('Content-type', 'application/pdf');
stream.pipe(response); stream.pipe(response);
}).catch(e => { }).catch(e => {