From 5264cfe4c07eae1fe1bc63d8db1de55a3ac9c971 Mon Sep 17 00:00:00 2001 From: Lucas Briese Date: Mon, 8 Nov 2021 18:50:15 +0100 Subject: [PATCH] fix ci docker hub --- lgsm/hooks/pre_push | 4 +--- test/testBuild.sh | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/lgsm/hooks/pre_push b/lgsm/hooks/pre_push index c274c60..051d72b 100644 --- a/lgsm/hooks/pre_push +++ b/lgsm/hooks/pre_push @@ -1,7 +1,6 @@ #!/bin/sh set -o errexit -#set -o pipefail set -o nounset imageSuffix="" @@ -9,10 +8,9 @@ if [ "$SOURCE_BRANCH" != "master" ]; then imageSuffix="-$(echo "$SOURCE_BRANCH" | sed 's/\//-/g')" fi -#docker build -t "$DOCKER_REPO:lgsm_debian${imageSuffix}" "lgsm/" cd .. -bash test/testBuild.sh "$imageSuffix" true +bash test/testBuild.sh "$imageSuffix" docker push "$DOCKER_REPO:gmod_debian${imageSuffix}" docker push "$DOCKER_REPO:gmod_ttt_debian${imageSuffix}" diff --git a/test/testBuild.sh b/test/testBuild.sh index c257b50..e56ef99 100644 --- a/test/testBuild.sh +++ b/test/testBuild.sh @@ -2,7 +2,7 @@ readonly SUFFIX="$1" readonly BUILD_LGSM="$(grep -qF '--skip-lgsm' <<< "$@" && echo false || echo true)" -readonly repository="index.docker.io/jusito/docker-ttt" +readonly repository="${DOCKER_REPO:-jusito/docker-ttt}" if [ "${DEBUGGING}" = "true" ]; then set -o xtrace