Merge branch 'dev' of https://git.verdnatura.es/salix into dev
This commit is contained in:
commit
fd08a6991e
|
@ -7,7 +7,7 @@ def branchName = "${env.BRANCH_NAME}";
|
||||||
def branchNameTest = "preprod";
|
def branchNameTest = "preprod";
|
||||||
def branchNameProd = "master";
|
def branchNameProd = "master";
|
||||||
def prefixDocker = "test";
|
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 dockerAuthName = ["auth", "-p 3000:3000"]
|
||||||
def dockerSalixName = ["salix", "-p 3001:3001"]
|
def dockerSalixName = ["salix", "-p 3001:3001"]
|
||||||
def dockerClientName = ["client", "-p 3002:3002"]
|
def dockerClientName = ["client", "-p 3002:3002"]
|
||||||
|
@ -25,6 +25,10 @@ node {
|
||||||
checkout scm
|
checkout scm
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stage ('webpack'){
|
||||||
|
sh "webpack"
|
||||||
|
}
|
||||||
|
|
||||||
stage ('install modules'){
|
stage ('install modules'){
|
||||||
sh "npm install"
|
sh "npm install"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue