From e162516a969ea6064c4689de4539e5e15698d4a5 Mon Sep 17 00:00:00 2001
From: Sebastian Waldbauer <waldbauer@cert.at>
Date: Thu, 15 Apr 2021 12:19:52 +0200
Subject: [PATCH] FIX: Removed old git rev-parse & use git describe

Signed-off-by: Sebastian Waldbauer <waldbauer@cert.at>
---
 build.sh    | 11 +++++------
 versions.sh |  6 +++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build.sh b/build.sh
index fb0edca..575d8b2 100755
--- a/build.sh
+++ b/build.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 build_date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-git_ref_core=$(cd ./intelmq && git rev-parse --short HEAD)
-git_ref_manager=$(cd ./intelmq-manager && git rev-parse --short HEAD)
-git_ref_api=$(cd ./intelmq-api && git rev-parse --short HEAD)
-build_version="2.3.1"
+git_ref_core=$(cd ./intelmq && git describe --long)
+git_ref_manager=$(cd ./intelmq-manager && git describe --long)
+git_ref_api=$(cd ./intelmq-api && git describe --long)
+build_version=$(cd ./intelmq && git describe)
 
 echo Building new IntelMQ-Image v$build_version
 echo Core      : $git_ref_core
@@ -26,9 +26,8 @@ docker build --build-arg BUILD_DATE=$build_date \
     --build-arg VCS_REF="IntelMQ=$git_ref_core, IntelMQ-API=$git_ref_api, IntelMQ-Manager=$git_ref_manager" \
     --build-arg BUILD_VERSION=$build_version \
     -f ./.docker/intelmq-full/Dockerfile \
-    -t intelmq-full:$build_version \
     -t intelmq-full:latest .
 
 cd ./intelmq-manager \
     && rm -r html \
-    && cd ..
+    && cd ..
\ No newline at end of file
diff --git a/versions.sh b/versions.sh
index c154a18..83c7bcc 100755
--- a/versions.sh
+++ b/versions.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
-intelmq_full_built=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.created" }}' intelmq-full:1.0)
-intelmq_full_vers=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.version" }}' intelmq-full:1.0)
-intelmq_full_rev=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.revision" }}' intelmq-full:1.0)
+intelmq_full_built=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.created" }}' intelmq-full:latest)
+intelmq_full_vers=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.version" }}' intelmq-full:latest)
+intelmq_full_rev=$(docker inspect --format '{{ index .Config.Labels "org.opencontainers.image.revision" }}' intelmq-full:latest)
 
 echo IntelMQ built at \"$intelmq_full_built\" \(Version $intelmq_full_vers\)
 revisions=$(echo $intelmq_full_rev | tr "," "\n")