From 88666330f5c93cb740ed668c837c7a797f3f47fc Mon Sep 17 00:00:00 2001 From: Arkadiusz Hiler Date: Mon, 2 Sep 2019 10:23:14 +0300 Subject: .gitlab-ci: Remove dead code TAG is unused since few revisions of the original patchset ago and never was cleaned up properly. Signed-off-by: Arkadiusz Hiler Reviewed-by: Petri Latvala --- .gitlab-ci/pull-or-rebuild.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to '.gitlab-ci') diff --git a/.gitlab-ci/pull-or-rebuild.sh b/.gitlab-ci/pull-or-rebuild.sh index 9f33b414..7e69477e 100755 --- a/.gitlab-ci/pull-or-rebuild.sh +++ b/.gitlab-ci/pull-or-rebuild.sh @@ -38,12 +38,12 @@ IMAGE_PRESENT=$? set -e if [ $IMAGE_PRESENT -eq 0 ] && [ ${FORCE_REBUILD:-0} -eq 0 ] ; then - echo "Skipping $NAME:$TAG, already built" + echo "Skipping, already built" docker tag $DOCKERNAME $NAME docker tag $DOCKERNAME $REFNAME docker tag $DOCKERNAME $COMMITNAME else - echo "Building $NAME:$TAG" + echo "Building!" docker build --build-arg=CI_COMMIT_SHA=$CI_COMMIT_SHA \ -t $DOCKERNAME -t $NAME \ -t $REFNAME -t $COMMITNAME -f $DOCKERFILE . @@ -51,7 +51,3 @@ else fi docker push $REFNAME docker push $COMMITNAME -if [ $TAG = "master" ]; then - docker tag $CHECKNAME $IMAGENAME - docker push $IMAGENAME -fi -- cgit v1.2.3