Browse Source

login before checking metadata

tags/v1.4.4
Jonathan Cobb 3 years ago
parent
commit
1809f943f6
1 changed files with 3 additions and 3 deletions
  1. +3
    -3
      bin/jenkins/push_docker

+ 3
- 3
bin/jenkins/push_docker View File

@@ -31,6 +31,9 @@ set +x
THISDIR="$(cd "$(dirname "${0}")" && pwd)" THISDIR="$(cd "$(dirname "${0}")" && pwd)"
BUBBLE_DIR="$(cd "${THISDIR}/../.." && 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..." echo "Determining Bubble version..."
META_FILE="${BUBBLE_DIR}/bubble-server/src/main/resources/META-INF/bubble/bubble.properties" 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')" 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 fi
echo "Found Bubble version ${VERSION}" 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..." echo "Checking to see if this version already exists on dockerhub..."
if docker manifest inspect "getbubble/launcher:${VERSION}" 2> /dev/null ; then if docker manifest inspect "getbubble/launcher:${VERSION}" 2> /dev/null ; then
echo "Version already exists on dockerhub, not re-publishing: ${VERSION}" echo "Version already exists on dockerhub, not re-publishing: ${VERSION}"


Loading…
Cancel
Save