Skip to content

Commit af11418

Browse files
authored
docker creds in build-specific directory (#5167)
1 parent 285f9d4 commit af11418

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

tools/jenkins/apache/dockerhub.groovy

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,22 +26,25 @@ node('ubuntu') {
2626
stage("Build and Deploy to DockerHub") {
2727
def JAVA_JDK_8=tool name: 'jdk_1.8_latest', type: 'hudson.model.JDK'
2828
withEnv(["Path+JDK=$JAVA_JDK_8/bin","JAVA_HOME=$JAVA_JDK_8"]) {
29+
sh "mkdir $WORKSPACE/local-docker-cfg"
2930
withCredentials([usernamePassword(credentialsId: 'openwhisk_dockerhub', passwordVariable: 'DOCKER_PASSWORD', usernameVariable: 'DOCKER_USER')]) {
30-
sh 'docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}'
31+
sh 'HOME="$WORKSPACE/local-docker-cfg" docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}'
3132
}
3233
def PUSH_CMD = "./gradlew :core:controller:distDocker :core:invoker:distDocker :core:standalone:distDocker :core:monitoring:user-events:distDocker :tools:ow-utils:distDocker :core:cosmos:cache-invalidator:distDocker -PdockerRegistry=docker.io -PdockerImagePrefix=openwhisk"
3334
def gitCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
3435
def shortCommit = gitCommit.take(7)
3536
sh "./gradlew clean"
36-
sh "${PUSH_CMD} -PdockerImageTag=nightly"
37-
sh "${PUSH_CMD} -PdockerImageTag=${shortCommit}"
37+
sh "HOME=\"$WORKSPACE/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=nightly"
38+
sh "HOME=\"$WORKSPACE/local-docker-cfg\" ${PUSH_CMD} -PdockerImageTag=${shortCommit}"
3839
}
3940
}
4041

4142
stage("Clean") {
4243
sh "docker images"
4344
sh 'docker rmi -f $(docker images -f "reference=openwhisk/*" -q) || true'
4445
sh "docker images"
46+
sh "docker logout"
47+
sh "rm -rf $WORKSPACE/local-docker-cfg"
4548
}
4649

4750
stage("Notify") {

0 commit comments

Comments
 (0)