From 7ec5bf1e91c42eacab315fa5dfc3357bbff5b161 Mon Sep 17 00:00:00 2001 From: Jose Alvarez Date: Mon, 8 Feb 2021 10:17:33 +0100 Subject: [PATCH] Restored deployment script and adjusted to use GitHub env (#252) --- scripts/deploy_docker.sh | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/scripts/deploy_docker.sh b/scripts/deploy_docker.sh index 90f33cb92..632db311d 100755 --- a/scripts/deploy_docker.sh +++ b/scripts/deploy_docker.sh @@ -2,15 +2,23 @@ set -euo pipefail +# Workflow run number +export BUILD_NUMBER=$GITHUB_RUN_NUMBER +# strip the first char as that should always be "v" (as tags should be in the format "vX.X.X") +description="$(git describe --tags --always)" +export VERSION=${description:1} + +echo "Trigger docker build and upload for version $VERSION ($BUILD_NUMBER)" + if [ "$1" = "develop" -o "$1" = "main" ]; then # If image does not exist, don't use cache - docker pull gnosispm/$DOCKERHUB_PROJECT:$1 && \ - docker build -t $DOCKERHUB_PROJECT -f Dockerfile . --cache-from gnosispm/$DOCKERHUB_PROJECT:$1 || \ - docker build -t $DOCKERHUB_PROJECT -f Dockerfile . + docker pull $DOCKERHUB_ORG/$DOCKERHUB_PROJECT:$1 && \ + docker build -t $DOCKERHUB_PROJECT -f Dockerfile --build-arg VERSION --build-arg BUILD_NUMBER . --cache-from $DOCKERHUB_ORG/$DOCKERHUB_PROJECT:$1 || \ + docker build -t $DOCKERHUB_PROJECT -f Dockerfile --build-arg VERSION --build-arg BUILD_NUMBER . else - docker pull gnosispm/$DOCKERHUB_PROJECT:staging && \ - docker build -t $DOCKERHUB_PROJECT -f Dockerfile . --cache-from gnosispm/$DOCKERHUB_PROJECT:staging || \ - docker build -t $DOCKERHUB_PROJECT -f Dockerfile . + docker pull $DOCKERHUB_ORG/$DOCKERHUB_PROJECT:staging && \ + docker build -t $DOCKERHUB_PROJECT -f Dockerfile --build-arg VERSION --build-arg BUILD_NUMBER . --cache-from $DOCKERHUB_ORG/$DOCKERHUB_PROJECT:staging || \ + docker build -t $DOCKERHUB_PROJECT -f Dockerfile --build-arg VERSION --build-arg BUILD_NUMBER . fi -docker tag $DOCKERHUB_PROJECT gnosispm/$DOCKERHUB_PROJECT:$1 -docker push gnosispm/$DOCKERHUB_PROJECT:$1 +docker tag $DOCKERHUB_PROJECT $DOCKERHUB_ORG/$DOCKERHUB_PROJECT:$1 +docker push $DOCKERHUB_ORG/$DOCKERHUB_PROJECT:$1