From be6fa25001783a622c54ec4bb2ed374099a046c3 Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Tue, 6 Jun 2017 14:00:30 +0200 Subject: [PATCH 1/2] Jenkins --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7cecefe16c..3d33de37b8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ def branchName = "${env.BRANCH_NAME}"; def branchNameTest = "preprod"; def branchNameProd = "master"; def prefixDocker = "test"; -def dockerNginxName = ["nginx", "-p 80:8080 --privileged --link test-auth:auth --link test-salix:salix --link test-client:client"] +def dockerNginxName = ["nginx", "-p 80:80 --privileged --link test-auth:auth --link test-salix:salix --link test-client:client"] def dockerAuthName = ["auth", "-p 3000:3000"] def dockerSalixName = ["salix", "-p 3001:3001"] def dockerClientName = ["client", "-p 3002:3002"] From fb4c0db6c5884946c188770e072062f00c67579f Mon Sep 17 00:00:00 2001 From: Vicente Falco Date: Tue, 6 Jun 2017 14:35:31 +0200 Subject: [PATCH 2/2] Jenkins webpack --- Jenkinsfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 3d33de37b8..954598dbe4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,6 +25,10 @@ node { checkout scm } + stage ('webpack'){ + sh "webpack" + } + stage ('install modules'){ sh "npm install" }