[CGKIELE-166] More accurate image tagging

Author: Christos KK Loverdos

docker/Dockerfile

@@ -46,12 +46,14 @@ RUN . ~/.nix-profile/etc/profile.d/nix.sh \
 # TODO: Could just use a nix-shell and garbage collect (e.g. git, unzip, sbt) after the installations ...
 RUN . ~/.nix-profile/etc/profile.d/nix.sh \
     && mkdir repos && cd repos \
-    && git clone --branch $SBT_VERIFY_TAG --depth=1 https://github.com/input-output-hk/sbt-verify.git \
+    && git clone https://github.com/input-output-hk/sbt-verify.git \
     && cd sbt-verify \
+    && git checkout $SBT_VERIFY_TAG \
     && sbt publishLocal \
     && cd - \
-    && git clone --branch $MANTIS_TAG --depth=1 https://github.com/input-output-hk/mantis.git \
+    && git clone https://github.com/input-output-hk/mantis.git \
     && cd mantis \
+    && git checkout $MANTIS_TAG \
     && git submodule update --init \
     && sbt 'set test in Test := {}' dist \
     && mkdir -p ~/mantis-dist/app \

docker/build.sh

@@ -3,7 +3,18 @@
 set -eux
 
 HERE=$(readlink -m $(dirname ${BASH_SOURCE[0]}))
-DATE_TAG=$(date --iso-8601)
-TAG=${1:-$DATE_TAG}
 
-docker build -t mantis:$TAG $HERE
+IMAGE_NAME=mantis
+DOCKERFILE=Dockerfile
+
+# If IMAGE_TAG is not given in the command line, then compute one in the format
+#
+#   YYYY-MM-DD '.' SHORT_HASH
+#
+# where the variable parts refer to the latest commit
+IMAGE_TAG=${1:-$(git log -1 --format=%cd.%h --date=short)}
+
+# This is the commit that the image will be based on
+COMMIT=$(git log -1 --format=%H)
+
+docker build --build-arg MANTIS_TAG=${COMMIT} -t $IMAGE_NAME:$IMAGE_TAG -f $HERE/$DOCKERFILE $HERE