From 0009680eaf41cb876ae8f23fdd1caac8d1937321 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sun, 21 Aug 2022 16:42:38 +0200 Subject: [PATCH] added push release --- scripts/build_release.sh | 9 +++++++-- scripts/push_release.sh | 17 +++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/scripts/build_release.sh b/scripts/build_release.sh index cf096a3..ab446cd 100755 --- a/scripts/build_release.sh +++ b/scripts/build_release.sh @@ -2,7 +2,9 @@ echo "building docker image" -tag="$REGISTRY/$SERVICE:${COMMIT_SHA:0:10}" +base_tag="$REGISTRY/$SERVICE" +tag="$base_tag:${COMMIT_SHA:0:10}" +latest_tag="$base_tag:latest" if [[ -n $DEBUG ]] then @@ -13,4 +15,7 @@ then echo " TMP: $TMP" fi -DOCKER_BUILDKIT=1 docker build -t "$tag" -f "$TMP/build_release.Dockerfile" . +docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD + +DOCKER_BUILDKIT=1 docker build --cache-from "$latest_tag" -t "$tag" -f "$TMP/build_release.Dockerfile" . +docker tag "$tag" "$latest" diff --git a/scripts/push_release.sh b/scripts/push_release.sh index abec648..c0d8c52 100755 --- a/scripts/push_release.sh +++ b/scripts/push_release.sh @@ -2,20 +2,17 @@ set -e -tag="$REGISTRY/$SERVICE:${COMMIT_SHA:0:10}" +base_tag="$REGISTRY/$SERVICE" +tag="$base_tag:${COMMIT_SHA:0:10}" +latest_tag="$base_tag:latest" -if [[ -n $DEBUG ]] -then - echo "debug:" - echo " REGISTRY: $REGISTRY" - echo " SERVICE: $SERVICE" - echo " COMMIT_SHA: $COMMIT_SHA" - echo " TMP: $TMP" -fi +export DOCKER_BUILDKIT=1 echo "docker: logging in" docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD echo "docker: pushing image $tag" -DOCKER_BUILDKIT=1 docker push "$tag" +docker push "$tag" & +docker push "$latest_tag" & +wait