From 4f63a66a6de3d57bd85d3dbee2a3fb037379e7ee Mon Sep 17 00:00:00 2001
From: Avgustin Marinov <Avgustin.Marinov@bosch.com>
Date: Mon, 22 Jan 2024 09:52:12 +0200
Subject: [PATCH] Fix docker images and micro-service compose (#1560)

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com
---
 .../docker-compose-micro-services-mysql.yml   | 28 +++++++++++++++++++
 .../docker/docker_build/Dockerfile            |  2 +-
 .../docker/docker_build/Dockerfile-mysql      |  2 +-
 .../docker/docker_build/Dockerfile_dev        |  2 +-
 .../docker/docker_build/Dockerfile_dev-mysql  |  2 +-
 5 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml b/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml
index 7e11b6ef0..d8586b8a0 100644
--- a/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml
+++ b/hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml
@@ -75,3 +75,31 @@ services:
     labels:
       NAME: "hawkbit-mgmt"
 
+
+#  # ---------------------
+#  # HawkBit Vaadin 8 based UI (NOT SUPPORTED!)
+#  # Outdated and not supported - may not work or lead to problems.
+#  # NOT Recommended - use it only AT YOUR RISK!
+#  # ---------------------
+#  hawkbit-vv8ui:
+#    image: "hawkbit/hawkbit-vv8-ui:latest-mysql"
+#    environment:
+#      - 'SPRING_DATASOURCE_URL=jdbc:mariadb://mysql:3306/hawkbit'
+#      - 'SPRING_RABBITMQ_HOST=rabbitmq'
+#      - 'SPRING_RABBITMQ_USERNAME=guest'
+#      - 'SPRING_RABBITMQ_PASSWORD=guest'
+#      - 'SPRING_DATASOURCE_USERNAME=root'
+#    volumes:
+#      - artifactrepo:/artifactrepo
+#    restart: always
+#    ports:
+#      - "8082:8082"
+#    depends_on:
+#      mysql:
+#        condition: service_healthy
+#    labels:
+#      NAME: "hawkbit-vv8-ui"
+
+volumes:
+  artifactrepo:
+    driver: local
diff --git a/hawkbit-runtime/docker/docker_build/Dockerfile b/hawkbit-runtime/docker/docker_build/Dockerfile
index e0a343f8f..67127b0f1 100644
--- a/hawkbit-runtime/docker/docker_build/Dockerfile
+++ b/hawkbit-runtime/docker/docker_build/Dockerfile
@@ -41,4 +41,4 @@ ENV JAVA_OPTS="-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250
 
 VOLUME "/artifactrepo"
 EXPOSE ${CONTAINER_PORT}
-ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"]
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.launch.JarLauncher ${@}"]
diff --git a/hawkbit-runtime/docker/docker_build/Dockerfile-mysql b/hawkbit-runtime/docker/docker_build/Dockerfile-mysql
index 99d5a01dd..89328f477 100644
--- a/hawkbit-runtime/docker/docker_build/Dockerfile-mysql
+++ b/hawkbit-runtime/docker/docker_build/Dockerfile-mysql
@@ -53,4 +53,4 @@ ENV JAVA_OPTS="-Dspring.profiles.active=mysql -Xms768m -Xmx768m -XX:MaxMetaspace
 
 VOLUME "/artifactrepo"
 EXPOSE ${CONTAINER_PORT}
-ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"]
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.launch.JarLauncher ${@}"]
diff --git a/hawkbit-runtime/docker/docker_build/Dockerfile_dev b/hawkbit-runtime/docker/docker_build/Dockerfile_dev
index e4d610075..136ec5bcc 100644
--- a/hawkbit-runtime/docker/docker_build/Dockerfile_dev
+++ b/hawkbit-runtime/docker/docker_build/Dockerfile_dev
@@ -35,4 +35,4 @@ ENV JAVA_OPTS="-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250
 
 VOLUME "/artifactrepo"
 EXPOSE ${CONTAINER_PORT}
-ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"]
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.launch.JarLauncher ${@}"]
diff --git a/hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql b/hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql
index 3629b4588..5a783c0a5 100644
--- a/hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql
+++ b/hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql
@@ -37,4 +37,4 @@ ENV JAVA_OPTS="-Dspring.profiles.active=mysql -Xms768m -Xmx768m -XX:MaxMetaspace
 
 VOLUME "/artifactrepo"
 EXPOSE ${CONTAINER_PORT}
-ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"]
+ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.launch.JarLauncher ${@}"]