Fix artifact repo in docker & compose (#1495)

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

hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml

@@ -57,6 +57,8 @@ services:
       - 'SPRING_RABBITMQ_USERNAME=guest'
       - 'SPRING_RABBITMQ_PASSWORD=guest'
       - 'SPRING_DATASOURCE_USERNAME=root'
+    volumes:
+      - artifactrepo:/artifactrepo
     restart: always
     ports:
       - "8080:8080"
@@ -75,8 +77,14 @@ services:
       - 'SPRING_RABBITMQ_USERNAME=guest'
       - 'SPRING_RABBITMQ_PASSWORD=guest'
       - 'SPRING_DATASOURCE_USERNAME=root'
+    volumes:
+      - artifactrepo:/artifactrepo
     restart: always
     ports:
       - "8082:8082"
     labels:
-      NAME: "hawkbit-vv8-ui"
+      NAME: "hawkbit-vv8-ui"
+
+volumes:
+  artifactrepo:
+    driver: local

hawkbit-runtime/docker/docker-compose-monolith-mysql.yml

@@ -49,8 +49,14 @@ services:
       - 'SPRING_RABBITMQ_USERNAME=guest'
       - 'SPRING_RABBITMQ_PASSWORD=guest'
       - 'SPRING_DATASOURCE_USERNAME=root'
+    volumes:
+      - artifactrepo:/artifactrepo
     restart: always
     ports:
       - "8080:8080"
     labels:
       NAME: "hawkbit"
+
+volumes:
+  artifactrepo:
+    driver: local

hawkbit-runtime/docker/docker_build/Dockerfile

@@ -26,9 +26,6 @@ RUN set -x &&\
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine
 
-RUN addgroup -S rollouts && adduser -D sp -G rollouts
-USER sp
-
 ENV BUILD_DIR=/opt/hawkbit_build
 COPY --from=build ${BUILD_DIR}/dependencies/ ./
 COPY --from=build ${BUILD_DIR}/spring-boot-loader/ ./
@@ -38,5 +35,6 @@ COPY --from=build ${BUILD_DIR}/application/ ./
 ARG CONTAINER_PORT=8080
 ENV JAVA_OPTS="-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"
 
+VOLUME "/artifactrepo"
 EXPOSE ${CONTAINER_PORT}
 ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"]

hawkbit-runtime/docker/docker_build/Dockerfile-mysql

@@ -36,9 +36,6 @@ RUN set -x &&\
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine
 
-RUN addgroup -S rollouts && adduser -D sp -G rollouts
-USER sp
-
 ENV BUILD_DIR=/opt/hawkbit_build
 COPY --from=build ${BUILD_DIR}/dependencies/ ./
 COPY --from=build ${BUILD_DIR}/spring-boot-loader/ ./
@@ -50,5 +47,6 @@ COPY --from=build ${BUILD_DIR}/mariadb-java-client-${MARIADB_DRIVER_VERSION}.jar
 ARG CONTAINER_PORT=8080
 ENV JAVA_OPTS="-Dspring.profiles.active=mysql -Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"
 
+VOLUME "/artifactrepo"
 EXPOSE ${CONTAINER_PORT}
 ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"]

hawkbit-runtime/docker/docker_build/Dockerfile_dev

@@ -20,9 +20,6 @@ RUN set -x &&\
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine
 
-RUN addgroup -S rollouts && adduser -D sp -G rollouts
-USER sp
-
 ENV BUILD_DIR=/opt/hawkbit_build
 COPY --from=build ${BUILD_DIR}/dependencies/ ./
 COPY --from=build ${BUILD_DIR}/spring-boot-loader/ ./
@@ -32,5 +29,6 @@ COPY --from=build ${BUILD_DIR}/application/ ./
 ARG CONTAINER_PORT=8080
 ENV JAVA_OPTS="-Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"
 
+VOLUME "/artifactrepo"
 EXPOSE ${CONTAINER_PORT}
 ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"]

hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql

@@ -20,9 +20,6 @@ RUN set -x &&\
 
 FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine
 
-RUN addgroup -S rollouts && adduser -D sp -G rollouts
-USER sp
-
 ENV BUILD_DIR=/opt/hawkbit_build
 COPY --from=build ${BUILD_DIR}/dependencies/ ./
 COPY --from=build ${BUILD_DIR}/spring-boot-loader/ ./
@@ -34,5 +31,6 @@ COPY org/mariadb/jdbc/mariadb-java-client/${MARIADB_DRIVER_VERSION}/mariadb-java
 ARG CONTAINER_PORT=8080
 ENV JAVA_OPTS="-Dspring.profiles.active=mysql -Xms768m -Xmx768m -XX:MaxMetaspaceSize=250m -XX:MetaspaceSize=250m -Xss300K -XX:+UseG1GC -XX:+UseStringDeduplication -XX:+UseCompressedOops -XX:+HeapDumpOnOutOfMemoryError"
 
+VOLUME "/artifactrepo"
 EXPOSE ${CONTAINER_PORT}
 ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"]