From d76f441a5d23b379f3dd3af1fc317cb130f80120 Mon Sep 17 00:00:00 2001 From: Lucas Burson Date: Thu, 15 Feb 2024 23:36:31 -0600 Subject: [PATCH] Include the git tag 'VERSION' in logging (#96) --- api/Dockerfile | 2 +- api/docker.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index 13cc8b8..e94c880 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -30,7 +30,7 @@ RUN \ WORKDIR /maproulette-api RUN \ - echo "\n\nBUILDING API COMMIT $(git rev-parse HEAD)\n\n" && \ + echo "\n\nBUILDING API VERSION=${VERSION} COMMIT=$(git rev-parse HEAD)\n\n" && \ sbt evicted && \ sbt clean compile dist && \ unzip -d / target/universal/MapRouletteAPI.zip diff --git a/api/docker.sh b/api/docker.sh index 427ef86..adee115 100755 --- a/api/docker.sh +++ b/api/docker.sh @@ -3,7 +3,7 @@ set -exuo pipefail export VERSION=$1 -# Git branches may contains forward slashes and that don't work with docker. Replace any slashes with a dash. +# Git branches may contains forward slashes and that doesn't work with container image tagging. Replace any slashes with a dash. export IMAGE_TAG=${VERSION//\//-} git=(${2//:/ }) CACHEBUST=${VERSION}