From 3275622e41d1f8f979c299f6d09e37aa8666d15a Mon Sep 17 00:00:00 2001
From: dervoeti <lukas.voetmand@stackable.tech>
Date: Wed, 23 Oct 2024 13:55:50 +0200
Subject: [PATCH 1/2] fix: determine correct version for Golang components

---
 opa/Dockerfile             | 11 +++++------
 statsd_exporter/Dockerfile | 11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/opa/Dockerfile b/opa/Dockerfile
index b25cc0e2d..6f3913921 100644
--- a/opa/Dockerfile
+++ b/opa/Dockerfile
@@ -85,12 +85,11 @@ WORKDIR /opa
 
 RUN <<EOF
 # Unfortunately, we need to create a dummy Git repository to allow cyclonedx-gomod to determine the version of OPA
-git init
-git add go.mod
-git config --global user.email "dummy@stackable.tech"
-git config --global user.name "dummy"
-git commit -m "dummy"
-git tag "${PRODUCT}"
+git init && \
+git config user.email "fake.commiter@stackable.tech" && \
+git config user.name "Fake commiter" && \
+git commit --allow-empty --message "Fake commit, so that we can create a tag" &&
+git tag "v${PRODUCT}"
 go build -o opa -buildmode=exe
 ~/go/bin/cyclonedx-gomod app -json -output-version 1.5 -output "opa_${PRODUCT}.cdx.json" -packages -files
 EOF
diff --git a/statsd_exporter/Dockerfile b/statsd_exporter/Dockerfile
index a64efe36a..e1e929a21 100644
--- a/statsd_exporter/Dockerfile
+++ b/statsd_exporter/Dockerfile
@@ -31,12 +31,11 @@ curl "https://repo.stackable.tech/repository/packages/statsd_exporter/statsd_exp
   cd "statsd_exporter-${PRODUCT}" || exit
 
   # Unfortunately, we need to create a dummy Git repository to allow cyclonedx-gomod to determine the version of statsd_exporter
-  git init
-  git add go.mod
-  git config --global user.email "dummy@stackable.tech"
-  git config --global user.name "dummy"
-  git commit -m "dummy"
-  git tag "${PRODUCT}"
+  git init && \
+  git config user.email "fake.commiter@stackable.tech" && \
+  git config user.name "Fake commiter" && \
+  git commit --allow-empty --message "Fake commit, so that we can create a tag" &&
+  git tag "v${PRODUCT}"
   go build -o ../statsd_exporter
   $GOPATH/bin/cyclonedx-gomod app -json -output-version 1.5 -output ../statsd_exporter-${PRODUCT}.cdx.json -packages -files
 )

From e49ea28cb1a6d4a33c88ba62f98fb355bd199b9e Mon Sep 17 00:00:00 2001
From: dervoeti <lukas.voetmand@stackable.tech>
Date: Wed, 23 Oct 2024 17:02:22 +0200
Subject: [PATCH 2/2] chore: remove unnecessary symbols

---
 opa/Dockerfile             | 8 ++++----
 statsd_exporter/Dockerfile | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/opa/Dockerfile b/opa/Dockerfile
index 6f3913921..a762e731e 100644
--- a/opa/Dockerfile
+++ b/opa/Dockerfile
@@ -85,10 +85,10 @@ WORKDIR /opa
 
 RUN <<EOF
 # Unfortunately, we need to create a dummy Git repository to allow cyclonedx-gomod to determine the version of OPA
-git init && \
-git config user.email "fake.commiter@stackable.tech" && \
-git config user.name "Fake commiter" && \
-git commit --allow-empty --message "Fake commit, so that we can create a tag" &&
+git init
+git config user.email "fake.commiter@stackable.tech"
+git config user.name "Fake commiter"
+git commit --allow-empty --message "Fake commit, so that we can create a tag"
 git tag "v${PRODUCT}"
 go build -o opa -buildmode=exe
 ~/go/bin/cyclonedx-gomod app -json -output-version 1.5 -output "opa_${PRODUCT}.cdx.json" -packages -files
diff --git a/statsd_exporter/Dockerfile b/statsd_exporter/Dockerfile
index e1e929a21..2a0e97e88 100644
--- a/statsd_exporter/Dockerfile
+++ b/statsd_exporter/Dockerfile
@@ -31,10 +31,10 @@ curl "https://repo.stackable.tech/repository/packages/statsd_exporter/statsd_exp
   cd "statsd_exporter-${PRODUCT}" || exit
 
   # Unfortunately, we need to create a dummy Git repository to allow cyclonedx-gomod to determine the version of statsd_exporter
-  git init && \
-  git config user.email "fake.commiter@stackable.tech" && \
-  git config user.name "Fake commiter" && \
-  git commit --allow-empty --message "Fake commit, so that we can create a tag" &&
+  git init
+  git config user.email "fake.commiter@stackable.tech"
+  git config user.name "Fake commiter"
+  git commit --allow-empty --message "Fake commit, so that we can create a tag"
   git tag "v${PRODUCT}"
   go build -o ../statsd_exporter
   $GOPATH/bin/cyclonedx-gomod app -json -output-version 1.5 -output ../statsd_exporter-${PRODUCT}.cdx.json -packages -files