From 1809f943f6f9552cc9630b18c28a912278dc787a Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Fri, 13 Nov 2020 12:42:32 -0500 Subject: [PATCH] login before checking metadata --- bin/jenkins/push_docker | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/jenkins/push_docker b/bin/jenkins/push_docker index de10d3d1..6a506cbf 100755 --- a/bin/jenkins/push_docker +++ b/bin/jenkins/push_docker @@ -31,6 +31,9 @@ set +x THISDIR="$(cd "$(dirname "${0}")" && pwd)" BUBBLE_DIR="$(cd "${THISDIR}/../.." && pwd)" +echo "Logging in to docker" +echo -n "${BUBBLE_DOCKER_PASS}" | docker login -u "${BUBBLE_DOCKER_USER}" --password-stdin || die "Error logging in to docker" + echo "Determining Bubble version..." META_FILE="${BUBBLE_DIR}/bubble-server/src/main/resources/META-INF/bubble/bubble.properties" VERSION="$(cat "${META_FILE}" | grep bubble.version | awk -F '=' '{print $2}' | awk -F ' ' '{print $NF}' | awk '{$1=$1};1')" @@ -39,9 +42,6 @@ if [[ -z "${VERSION}" ]] ; then fi echo "Found Bubble version ${VERSION}" -echo "Logging in to docker" -echo -n "${BUBBLE_DOCKER_PASS}" | docker login -u "${BUBBLE_DOCKER_USER}" --password-stdin || die "Error logging in to docker" - echo "Checking to see if this version already exists on dockerhub..." if docker manifest inspect "getbubble/launcher:${VERSION}" 2> /dev/null ; then echo "Version already exists on dockerhub, not re-publishing: ${VERSION}"