From 6cd065d201367bf2c6ce6e373671cd0c06a32488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20K=C3=BCffner?= <kueffner.markus@gmail.com>
Date: Wed, 14 Feb 2024 22:39:19 +0100
Subject: [PATCH] scripts: build: use git to generate human readable versions
 from upstream

---
 scripts/build-images.sh | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/scripts/build-images.sh b/scripts/build-images.sh
index 8622dbb..a349df5 100755
--- a/scripts/build-images.sh
+++ b/scripts/build-images.sh
@@ -18,10 +18,22 @@ platform="linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64/v8"
 dockerfile=docker/${app}/Dockerfile
 context=$(echo -n ${dockerfile} | rev | cut -f2- -d'/' | rev)
 
-# Get latest commitref from upstream repo
+# Get get versioning info from upstream repo
+## Set up directories
+pwd=$(pwd)
+tmp=$(mktemp -d)
+## Get upstream repo from Dockerfile
 source=$(grep "ARG REPO" ${dockerfile} | sed -r 's/.*REPO=(.*)$/\1/g')
-ref=$(git ls-remote ${source} HEAD | cut -f1)
-shortref=$(echo -n ${ref} | cut -c 1-7)
+## Clone repo
+git clone ${source} ${tmp} > /dev/null
+## enter repo directory and get infos
+cd ${tmp}
+upstream_version=$(git describe --tags)
+upstream_tags=($(git tag -l --sort='v:refname' | tail -n3))
+upstream_sha=$(git rev-parse HEAD)
+## Return to previous directory and remove tmp
+cd ${pwd}
+rm -rf ${tmp}
 
 # Set label Values
 label_date=$(date --rfc-3339=seconds)
@@ -53,14 +65,14 @@ for target in $(grep "FROM .* as" ${dockerfile} | sed -r 's/.*FROM.*as (.*)/\1/g
   fi
 
   ## latest
-  if docker buildx imagetools inspect ${registry}${app}:${shortref}${tag_extra} > /dev/null; then
-    log "## Image ${registry}${app}:${shortref}${tag_extra} already exists, nothing to do."
+  if docker buildx imagetools inspect ${registry}${app}:${upstream_version}${tag_extra} > /dev/null; then
+    log "## Image ${registry}${app}:${upstream_version}${tag_extra} already exists, nothing to do."
   else
-    log "## Building latest Image ${registry}${app}:${shortref}${tag_extra}"
+    log "## Building latest Image ${registry}${app}:${upstream_version}${tag_extra}"
     docker buildx build \
-      --build-arg VERSION=${ref} \
+      --build-arg VERSION=${upstream_sha} \
       --platform ${platform} \
-      --tag ${registry}${app}:${shortref}${tag_extra} \
+      --tag ${registry}${app}:${upstream_version}${tag_extra} \
       --tag ${registry}${app}:latest${tag_extra} \
       --label org.prind.version=${label_prind_version} \
       --label org.prind.image.created="${label_date}" \
@@ -68,14 +80,15 @@ for target in $(grep "FROM .* as" ${dockerfile} | sed -r 's/.*FROM.*as (.*)/\1/g
       --label org.prind.image.url="${label_url}" \
       --label org.prind.image.documentation="${label_doc}" \
       --label org.prind.image.source="${label_src}" \
-      --label org.prind.image.version="${ref}" \
+      --label org.prind.image.version="${upstream_version}" \
+      --label org.prind.image.sha="${upstream_sha}" \
       --target ${target} \
       --push \
       ${context}
   fi
 
   ## Tags
-  for tag in $(git -c 'versionsort.suffix=-' ls-remote --tags --sort='version:refname' --refs ${source} | tail -n3 | rev | cut -f1 -d'/' | rev); do
+  for tag in ${upstream_tags[@]}; do
     if docker buildx imagetools inspect ${registry}${app}:${tag}${tag_extra} > /dev/null; then
       log "## Image ${registry}${app}:${tag}${tag_extra} already exists, nothing to do."
     else
@@ -91,6 +104,7 @@ for target in $(grep "FROM .* as" ${dockerfile} | sed -r 's/.*FROM.*as (.*)/\1/g
         --label org.prind.image.documentation="${label_doc}" \
         --label org.prind.image.source="${label_src}" \
         --label org.prind.image.version="${tag}" \
+        --label org.prind.image.sha="${upstream_sha}" \
         --target ${target} \
         --push \
         ${context}