procyon/procyon
procyon/procyon
3
1
Fork 0
Code Issues 3 Pull requests 10 Projects Releases Packages 11 Activity

TECH;Deploy when merge to develop

Browse source
This commit is contained in:
Roman Jaroš 2020-07-29 09:49:50 +02:00
parent 780bb73e26
commit dd6128f604
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Jenkinsfile vendored
View file

@ -91,10 +91,10 @@ node {
}
stage("deploy") {
if (BRANCH_NAME.startsWith("deploy/") || BRANCH_NAME == 'master') {
if (BRANCH_NAME.startsWith("deploy/") || BRANCH_NAME == 'master' || BRANCH_NAME == 'develop') {
removeDockerImage()
def version = 'latest'
if (BRANCH_NAME != 'master') {
if (BRANCH_NAME != 'master' || BRANCH_NAME != 'develop') {
version = getBranchVersion()
}
sh "docker run --name treejs -d -p 81:80 --entrypoint='nginx' romanjaros/treejs:$version -g 'daemon off;'"

6
package-lock.json generated
View file

@ -8098,12 +8098,6 @@
"minipass": "^2.6.0"
}
},
"fs-react": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/fs-react/-/fs-react-0.0.4.tgz",
"integrity": "sha1-dVVvyvAPNZtJavZKcJb5LJ3sCL8=",
"dev": true
},
"fs-write-stream-atomic": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",