diff options
| author | Christian Segundo | 2024-08-12 00:47:09 +0200 |
|---|---|---|
| committer | Christian Segundo | 2024-08-12 00:47:09 +0200 |
| commit | 8eab731d7ed9de80e988cdb264800bdf9896b7d2 (patch) | |
| tree | 100515adb77993bc1f3687fb0477fbeaa7f08ab6 | |
| parent | b771a19850076ec309a63cb28c8edbb0a23cfe34 (diff) | |
| download | jenkins-agent-docker-cli-master.tar.gz | |
| -rw-r--r-- | .scripts.d/40-publish.sh | 4 | ||||
| -rw-r--r-- | Jenkinsfile | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/.scripts.d/40-publish.sh b/.scripts.d/40-publish.sh index d9ab7f0..00db190 100644 --- a/.scripts.d/40-publish.sh +++ b/.scripts.d/40-publish.sh @@ -19,8 +19,8 @@ docker buildx create --use --name "multi-arch-builder-${BUILDER_SUFFIX}" trap "docker buildx rm 'multi-arch-builder-""${BUILDER_SUFFIX}""'" EXIT DOCKER_TAG="latest" -if [ "$GIT_BRANCH" != "master" ]; then - DOCKER_TAG="${GIT_BRANCH//\//-}" +if [ "$BRANCH_NAME" != "master" ]; then + DOCKER_TAG="${BRANCH_NAME//\//-}" fi if [ "$(git tag --contains)" = "" ]; then diff --git a/Jenkinsfile b/Jenkinsfile index d29e541..a16496b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -18,10 +18,7 @@ pipeline { stage('Test') { steps { sh 'bash .scripts.d/30-test.sh' } } stage('Publish') { environment { DOCKERHUB_TOKEN = credentials('DOCKERHUB_TOKEN') } - steps { - sh 'env' - sh 'bash .scripts.d/40-publish.sh' - } + steps { sh 'bash .scripts.d/40-publish.sh' } } } post { |