From e8a7b64a1e11280eb1d923fa0bfe64ec8caeec7c Mon Sep 17 00:00:00 2001 From: Ashmita Bohara Date: Mon, 30 Nov 2020 10:53:52 +0800 Subject: [PATCH 1/2] Fix docker login issue with all-in-one build Signed-off-by: Ashmita Bohara --- scripts/travis/upload-to-docker.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/scripts/travis/upload-to-docker.sh b/scripts/travis/upload-to-docker.sh index 8de81afae01..fe43f4388db 100755 --- a/scripts/travis/upload-to-docker.sh +++ b/scripts/travis/upload-to-docker.sh @@ -31,15 +31,6 @@ if [[ -n $major ]]; then fi fi -if [[ -f $HOME/.docker/config.json ]]; then - rm -f $HOME/.docker/config.json -else - echo "$HOME/.docker/config.json doesn't exist" -fi - -# Do not enable echo before the `docker login` command to avoid revealing the password. -set -x -docker login docker.io -u $DOCKER_USER -p $DOCKER_PASS if [[ "${REPO}" == "jaegertracing/jaeger-opentelemetry-collector" || "${REPO}" == "jaegertracing/jaeger-opentelemetry-agent" || "${REPO}" == "jaegertracing/jaeger-opentelemetry-ingester" || "${REPO}" == "jaegertracing/opentelemetry-all-in-one" ]]; then # TODO remove once Jaeger OTEL collector is stable docker push $REPO:latest From 8f91022828390875f617f9d5e0c7f4cf0e29c64a Mon Sep 17 00:00:00 2001 From: Ashmita Bohara Date: Mon, 30 Nov 2020 11:40:34 +0800 Subject: [PATCH 2/2] Fix docker login issue with all-in-one build Signed-off-by: Ashmita Bohara --- scripts/travis/upload-to-docker.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/travis/upload-to-docker.sh b/scripts/travis/upload-to-docker.sh index fe43f4388db..65d49a6ff74 100755 --- a/scripts/travis/upload-to-docker.sh +++ b/scripts/travis/upload-to-docker.sh @@ -1,6 +1,6 @@ #!/bin/bash -set -e +set -euxf -o pipefail BRANCH=${BRANCH:?'missing BRANCH env var'} IMAGE="${REPO:?'missing REPO env var'}:latest" @@ -15,8 +15,7 @@ elif [[ $BRANCH =~ ^v([0-9]+)\.([0-9]+)\.([0-9]+)$ ]]; then TAG=${major}.${minor}.${patch} echo "BRANCH is a release tag: major=$major, minor=$minor, patch=$patch" else - # TODO why do we do /// ? - TAG="${BRANCH///}" + TAG="${BRANCH}" fi echo "TRAVIS_BRANCH=$TRAVIS_BRANCH, REPO=$REPO, BRANCH=$BRANCH, TAG=$TAG, IMAGE=$IMAGE"