From 4a6e862d57d18c73d56dcc529e346b8658cdd642 Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Thu, 26 Jun 2025 13:27:00 +0300
Subject: [PATCH] Fix release of db_init docker image (#2502)

Signed-off-by: Avgustin Marinov <Avgustin.Marinov@bosch.com>
---
 .github/workflows/release_docker.yml | 5 ++---
 docker/build/Dockerfile_dbinit       | 9 +++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release_docker.yml b/.github/workflows/release_docker.yml
index ac02eae7d..8a36090f5 100644
--- a/.github/workflows/release_docker.yml
+++ b/.github/workflows/release_docker.yml
@@ -30,9 +30,8 @@ jobs:
             "hawkbit-ddi-server",  "hawkbit-dmf-server", "hawkbit-mgmt-server", "hawkbit-simple-ui", 
             # monolith
             "hawkbit-update-server",
-            # db init, not released yet
-            #"hawkbit-repository-jpa-init"
-          )
+            # db init
+            "hawkbit-repository-jpa-init")
           echo "ALL_APPS_STRING=${ALL_APPS[*]}" >> $GITHUB_ENV
           echo "REVISION=${{ github.event.inputs.revision }}" >> $GITHUB_ENV
 
diff --git a/docker/build/Dockerfile_dbinit b/docker/build/Dockerfile_dbinit
index 8911bd00f..83ac591fb 100644
--- a/docker/build/Dockerfile_dbinit
+++ b/docker/build/Dockerfile_dbinit
@@ -14,7 +14,7 @@ RUN set -x &&\
  apk add --no-cache --virtual build-dependencies gnupg unzip libressl wget &&\
  gpg --import KEY &&\
  wget -O ${APP}-${VERSION}.jar --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/${APP}/${VERSION}/${APP}-${VERSION}.jar &&\
- wget -O ${APP}-${VERSION}.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/${APP}/${VERSION}/${APP}-${VERSION}.jar.asc &&\
+ wget -O ${APP}-${VERSION}.jar.asc --no-verbose https://repo1.maven.org/maven2/org/eclipse/hawkbit/${APP}/${VERSION}/${APP}-${VERSION}.jar.asc &&\
  gpg --batch --verify ${APP}-${VERSION}.jar.asc ${APP}-${VERSION}.jar &&\
  rm ${APP}-${VERSION}.jar.asc KEY &&\
  apk del build-dependencies
@@ -24,7 +24,12 @@ FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine
 RUN addgroup -S hawkbit_group && adduser -D hawkbit -G hawkbit_group
 USER hawkbit
 
-ENV BUILD_DIR=/opt/hawkbit_build
+ARG HAWKBIT_APP=hawkbit-repository-jpa-init
+ARG HAWKBIT_VERSION=pass_as_buils_arg
+
+ENV APP=${HAWKBIT_APP}
+ENV VERSION=${HAWKBIT_VERSION}
+
 COPY --from=build /${APP}-${VERSION}.jar ./
 
 ARG X_MS=256m