mirror of https://github.com/docker/docs.git
Merge pull request #1122 from psftw/tar-780
TAR-780 Remove redundant withVpn.
This commit is contained in:
commit
ac6d1055bd
|
@ -5,7 +5,6 @@ pipeline {
|
|||
label 'ubuntu-1604-aufs-stable'
|
||||
}
|
||||
environment {
|
||||
DTR_VPN_ADDRESS = credentials('dtr-vpn-address')
|
||||
DTR_URL = credentials('dtr-url')
|
||||
DOCKER_HOST_STRING = credentials('docker-host')
|
||||
UCP_BUNDLE = credentials('ucp-bundle')
|
||||
|
@ -26,7 +25,6 @@ pipeline {
|
|||
branch 'master'
|
||||
}
|
||||
steps {
|
||||
withVpn("$DTR_VPN_ADDRESS") {
|
||||
sh """
|
||||
cat $SUCCESS_BOT_TOKEN | docker login $DTR_URL --username 'success_bot' --password-stdin
|
||||
docker build -t $DTR_URL/docker/docker.github.io:stage-${env.BUILD_NUMBER} .
|
||||
|
@ -40,13 +38,11 @@ pipeline {
|
|||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
stage( 'build + push prod image, update prod swarm' ) {
|
||||
when {
|
||||
branch 'published'
|
||||
}
|
||||
steps {
|
||||
withVpn("$DTR_VPN_ADDRESS") {
|
||||
withDockerRegistry(reg) {
|
||||
sh """
|
||||
docker build -t docs/docker.github.io:prod-${env.BUILD_NUMBER} .
|
||||
|
@ -65,7 +61,6 @@ pipeline {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
stage( 'docs-private' ) {
|
||||
when {
|
||||
expression { env.GIT_URL == "https://github.com/docker/docs-private.git" }
|
||||
|
@ -76,7 +71,6 @@ pipeline {
|
|||
branch 'amberjack'
|
||||
}
|
||||
steps {
|
||||
withVpn("$DTR_VPN_ADDRESS") {
|
||||
sh """
|
||||
cat $SUCCESS_BOT_TOKEN | docker login $DTR_URL --username 'success_bot' --password-stdin
|
||||
docker build -t $DTR_URL/docker/docs-private:beta-stage-${env.BUILD_NUMBER} .
|
||||
|
@ -90,13 +84,11 @@ pipeline {
|
|||
"""
|
||||
}
|
||||
}
|
||||
}
|
||||
stage( 'build + push beta image, update beta swarm' ) {
|
||||
when {
|
||||
branch 'published'
|
||||
}
|
||||
steps {
|
||||
withVpn("$DTR_VPN_ADDRESS") {
|
||||
sh """
|
||||
cat $SUCCESS_BOT_TOKEN | docker login $DTR_URL --username 'success_bot' --password-stdin
|
||||
docker build -t $DTR_URL/docker/docs-private:beta-${env.BUILD_NUMBER} .
|
||||
|
@ -113,5 +105,4 @@ pipeline {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue