lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Fix artifact repo in docker & compose (#1495)

Browse Source 
Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>
This commit is contained in:
Avgustin Marinov
2023-12-01 17:44:41 +02:00
committed by GitHub
parent 960ab6872d
commit 6a3b584bd1
6 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hawkbit-runtime/docker/docker-compose-micro-services-mysql.yml
View File

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

6
hawkbit-runtime/docker/docker-compose-monolith-mysql.yml
View File

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

4
hawkbit-runtime/docker/docker_build/Dockerfile
View File

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

4
hawkbit-runtime/docker/docker_build/Dockerfile-mysql
View File

@@ -36,9 +36,6 @@ RUN set -x &&\
FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine
RUN addgroup -S rollouts && adduser -D sp -G rollouts
USER sp
ENV BUILD_DIR=/opt/hawkbit_build ENV BUILD_DIR=/opt/hawkbit_build
COPY --from=build ${BUILD_DIR}/dependencies/ ./ COPY --from=build ${BUILD_DIR}/dependencies/ ./
COPY --from=build ${BUILD_DIR}/spring-boot-loader/ ./ 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 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" 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} EXPOSE ${CONTAINER_PORT}
ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"] ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"]

4
hawkbit-runtime/docker/docker_build/Dockerfile_dev
View File

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

4
hawkbit-runtime/docker/docker_build/Dockerfile_dev-mysql
View File

@@ -20,9 +20,6 @@ RUN set -x &&\
FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine FROM eclipse-temurin:${JAVA_VERSION}-jre-alpine
RUN addgroup -S rollouts && adduser -D sp -G rollouts
USER sp
ENV BUILD_DIR=/opt/hawkbit_build ENV BUILD_DIR=/opt/hawkbit_build
COPY --from=build ${BUILD_DIR}/dependencies/ ./ COPY --from=build ${BUILD_DIR}/dependencies/ ./
COPY --from=build ${BUILD_DIR}/spring-boot-loader/ ./ 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 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" 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} EXPOSE ${CONTAINER_PORT}
ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"] ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} org.springframework.boot.loader.JarLauncher ${@}"]