refac: add short commit to tag

This commit adds the short commit after the timestamp. Will help to know which commit the image version will be coming from. Signed-off-by: Antony Reynaud <[email protected]>
cilium · Jul 31, 2024 · b7872f1 · b7872f1
1 parent 63ec437
commit b7872f1
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/scripts/make-image-tag.sh b/scripts/make-image-tag.sh
@@ -38,7 +38,9 @@ if [ "$#" -eq 1 ] ; then
     echo "${image_dir} is not a directory (path is relative to git root)"
     exit 1
   fi
-  image_tag="$(git log -1 --pretty=format:"%ct" "${image_dir}")"
+  timestamp="$(git log -1 --pretty=format:"%ct" "${image_dir}")"
+  short_commit="$(git log -1 --pretty=format:"%h" "${image_dir}")"
+  image_tag="${timestamp}-${short_commit}"
 else
   # if no arguments are given, attempt detecting if version tag is present,
   # otherwise use the a short commit hash