Fix simple UI docker image (#2811)

* Fix simple UI docker image Signed-off-by: strailov <Stanislav.Trailov@bosch.io> * Change workdir only when necessary Signed-off-by: strailov <Stanislav.Trailov@bosch.io> * artifactrepo also in /app Signed-off-by: strailov <Stanislav.Trailov@bosch.io> * add also /app in volume config Signed-off-by: strailov <Stanislav.Trailov@bosch.io> * fix artifact repo to be in /app and also fix volumes in docker compose Signed-off-by: strailov <Stanislav.Trailov@bosch.io> * Delete hawkbit-simple-ui/src/main/java/org/eclipse/hawkbit/ui/simple/config/AtmosphereConfig.java Signed-off-by: Stanislav Trailov <stanislav.trailov@bosch.com> * remove changes from download&install phase only Signed-off-by: strailov <Stanislav.Trailov@bosch.io> * fix volume for postgres compose files Signed-off-by: strailov <Stanislav.Trailov@bosch.io> * switch back to /app workspace also in db init * finalize absolut paths in db init dockerfiles * artifactrepo to relative path Signed-off-by: strailov <Stanislav.Trailov@bosch.io> * use relative path in dbinit dockerfiles Signed-off-by: strailov <Stanislav.Trailov@bosch.io> --------- Signed-off-by: strailov <Stanislav.Trailov@bosch.io> Signed-off-by: Stanislav Trailov <stanislav.trailov@bosch.com>
2025-11-19 15:44:15 +02:00
parent 4846587aee
commit f22a27c014
12 changed files with 23 additions and 21 deletions
--- a/docker/build/Dockerfile
+++ b/docker/build/Dockerfile
@@ -26,9 +26,10 @@ RUN set -x &&\
 rm /${APP}.jar

 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine
-
+ARG APP_DIR=/app
+WORKDIR ${APP_DIR}
 RUN addgroup -S hawkbit_group && adduser -D hawkbit -G hawkbit_group
-RUN mkdir -p /artifactrepo && chown -R hawkbit /artifactrepo
+RUN mkdir -p artifactrepo && chown -R hawkbit artifactrepo
 USER hawkbit

 ENV BUILD_DIR=/opt/hawkbit_build
@@ -37,7 +38,7 @@ COPY --from=build ${BUILD_DIR}/spring-boot-loader/ ./
 COPY --from=build ${BUILD_DIR}/snapshot-dependencies/ ./
 COPY --from=build ${BUILD_DIR}/application/ ./

-VOLUME "/artifactrepo"
+VOLUME /${APP_DIR}/artifactrepo

 ARG CONTAINER_PORT=8080
 EXPOSE ${CONTAINER_PORT}
--- a/docker/build/Dockerfile_dbinit
+++ b/docker/build/Dockerfile_dbinit
@@ -20,7 +20,7 @@ RUN set -x &&\
 apk del build-dependencies

 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine
-
+WORKDIR /app
 RUN addgroup -S hawkbit_group && adduser -D hawkbit -G hawkbit_group
 USER hawkbit

@@ -30,7 +30,7 @@ ARG HAWKBIT_VERSION=pass_as_buils_arg
 ENV APP=${HAWKBIT_APP}
 ENV VERSION=${HAWKBIT_VERSION}

-COPY --from=build /${APP}-${VERSION}.jar ./
+COPY --from=build ${APP}-${VERSION}.jar ./

 ARG X_MS=256m
 ENV X_MS=${X_MS}
@@ -47,4 +47,4 @@ ENV GC=${GC}
 ARG AND_THEN="exit 0"
 ENV AND_THEN=${AND_THEN}

-ENTRYPOINT ["sh", "-c", "java -classpath /${APP}-${VERSION}.jar ${JAVA_OPTS} -Xms${X_MS} -Xmx${X_MX} -XX:MaxMetaspaceSize=${XX_MAX_METASPACE_SIZE} -XX:MetaspaceSize=${XX_METASPACE_SIZE} -Xss${XSS} -XX:+Use${GC}GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError org.eclipse.hawkbit.repository.jpa.init.HawkbitFlywayDbInit ${@} && ${AND_THEN}"]
+ENTRYPOINT ["sh", "-c", "java -classpath ${APP}-${VERSION}.jar ${JAVA_OPTS} -Xms${X_MS} -Xmx${X_MX} -XX:MaxMetaspaceSize=${XX_MAX_METASPACE_SIZE} -XX:MetaspaceSize=${XX_METASPACE_SIZE} -Xss${XSS} -XX:+Use${GC}GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError org.eclipse.hawkbit.repository.jpa.init.HawkbitFlywayDbInit ${@} && ${AND_THEN}"]
--- a/docker/build/Dockerfile_dbinit_dev
+++ b/docker/build/Dockerfile_dbinit_dev
@@ -1,7 +1,7 @@
 # set Java
 ARG JAVA_VERSION=21.0.9_10
 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine AS build
-
+WORKDIR /app
 ARG HAWKBIT_APP=hawkbit-repository-jpa-init
 ARG HAWKBIT_VERSION=0-SNAPSHOT

@@ -9,10 +9,10 @@ ENV APP=${HAWKBIT_APP}
 ENV VERSION=${HAWKBIT_VERSION}

 RUN addgroup -S hawkbit_group && adduser -D hawkbit -G hawkbit_group
-RUN mkdir -p /artifactrepo && chown -R hawkbit /artifactrepo
+RUN mkdir -p artifactrepo && chown -R hawkbit artifactrepo
 USER hawkbit

-COPY org/eclipse/hawkbit/${APP}/${VERSION}/${APP}-${VERSION}.jar /${APP}-${VERSION}.jar
+COPY org/eclipse/hawkbit/${APP}/${VERSION}/${APP}-${VERSION}.jar ${APP}-${VERSION}.jar

 ARG X_MS=256m
 ENV X_MS=${X_MS}
@@ -29,4 +29,4 @@ ENV GC=${GC}
 ARG AND_THEN="exit 0"
 ENV AND_THEN=${AND_THEN}

-ENTRYPOINT ["sh", "-c", "java -classpath /${APP}-${VERSION}.jar ${JAVA_OPTS} -Xms${X_MS} -Xmx${X_MX} -XX:MaxMetaspaceSize=${XX_MAX_METASPACE_SIZE} -XX:MetaspaceSize=${XX_METASPACE_SIZE} -Xss${XSS} -XX:+Use${GC}GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError org.eclipse.hawkbit.repository.jpa.init.HawkbitFlywayDbInit ${@} && ${AND_THEN}"]
+ENTRYPOINT ["sh", "-c", "java -classpath ${APP}-${VERSION}.jar ${JAVA_OPTS} -Xms${X_MS} -Xmx${X_MX} -XX:MaxMetaspaceSize=${XX_MAX_METASPACE_SIZE} -XX:MetaspaceSize=${XX_METASPACE_SIZE} -Xss${XSS} -XX:+Use${GC}GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError org.eclipse.hawkbit.repository.jpa.init.HawkbitFlywayDbInit ${@} && ${AND_THEN}"]
--- a/docker/build/Dockerfile_dev
+++ b/docker/build/Dockerfile_dev
@@ -19,9 +19,10 @@ RUN set -x &&\
 rm /${APP}-${VERSION}.jar

 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine
-
+ARG APP_DIR=/app
+WORKDIR ${APP_DIR}
 RUN addgroup -S hawkbit_group && adduser -D hawkbit -G hawkbit_group
-RUN mkdir -p /artifactrepo && chown -R hawkbit /artifactrepo
+RUN mkdir -p artifactrepo && chown -R hawkbit artifactrepo
 USER hawkbit

 ENV BUILD_DIR=/opt/hawkbit_build
@@ -30,7 +31,7 @@ COPY --from=build ${BUILD_DIR}/spring-boot-loader/ ./
 COPY --from=build ${BUILD_DIR}/snapshot-dependencies/ ./
 COPY --from=build ${BUILD_DIR}/application/ ./

-VOLUME "/artifactrepo"
+VOLUME /${APP_DIR}/artifactrepo

 ARG CONTAINER_PORT=8080
 EXPOSE ${CONTAINER_PORT}
--- a/docker/mysql/docker-compose-micro-services-dbinit-mysql.yml
+++ b/docker/mysql/docker-compose-micro-services-dbinit-mysql.yml
@@ -91,7 +91,7 @@ services:
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
    volumes:
-      - artifactrepo:/artifactrepo
+      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
--- a/docker/mysql/docker-compose-micro-services-mysql.yml
+++ b/docker/mysql/docker-compose-micro-services-mysql.yml
@@ -67,7 +67,7 @@ services:
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
    volumes:
-      - artifactrepo:/artifactrepo
+      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
--- a/docker/mysql/docker-compose-monolith-dbinit-mysql.yml
+++ b/docker/mysql/docker-compose-monolith-dbinit-mysql.yml
@@ -51,7 +51,7 @@ services:
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
    volumes:
-      - artifactrepo:/artifactrepo
+      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
--- a/docker/mysql/docker-compose-monolith-mysql.yml
+++ b/docker/mysql/docker-compose-monolith-mysql.yml
@@ -27,7 +27,7 @@ services:
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
    volumes:
-      - artifactrepo:/artifactrepo
+      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
--- a/docker/postgres/docker-compose-micro-services-dbinit-postgres.yml
+++ b/docker/postgres/docker-compose-micro-services-dbinit-postgres.yml
@@ -95,7 +95,7 @@ services:
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
    volumes:
-      - artifactrepo:/artifactrepo
+      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
--- a/docker/postgres/docker-compose-micro-services-postgres.yml
+++ b/docker/postgres/docker-compose-micro-services-postgres.yml
@@ -70,7 +70,7 @@ services:
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
    volumes:
-      - artifactrepo:/artifactrepo
+      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
--- a/docker/postgres/docker-compose-monolith-dbinit-postgres.yml
+++ b/docker/postgres/docker-compose-monolith-dbinit-postgres.yml
@@ -53,7 +53,7 @@ services:
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
    volumes:
-      - artifactrepo:/artifactrepo
+      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"
--- a/docker/postgres/docker-compose-monolith-postgres.yml
+++ b/docker/postgres/docker-compose-monolith-postgres.yml
@@ -28,7 +28,7 @@ services:
      - 'SPRING_RABBITMQ_USERNAME=guest'
      - 'SPRING_RABBITMQ_PASSWORD=guest'
    volumes:
-      - artifactrepo:/artifactrepo
+      - artifactrepo:/app/artifactrepo
    restart: always
    ports:
      - "8080:8080"