Merge branch 'main' into develop

# Conflicts: # .github/workflows/build-project.yml # .github/workflows/release-project.yml # .github/workflows/sonarcloud-analysis.yml # app/src/main/docker/Dockerfile.jvm # app/src/main/docker/Dockerfile.native # pom.xml # service/src/main/java/org/lfenergy/compas/scl/auto/alignment/service/SclAutoAlignmentService.java
com-pas · Oct 5, 2023 · 982eea9 · 982eea9
2 parents cc73938 + 2a4b1bf
commit 982eea9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/src/main/docker/Dockerfile.jvm b/app/src/main/docker/Dockerfile.jvm
@@ -21,7 +21,7 @@
 # docker run -i --rm -p 8080:8080 -p 5005:5005 -e JAVA_ENABLE_DEBUG="true" quarkus/app-jvm
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072 
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
 
 ARG JAVA_PACKAGE=java-17-openjdk-headless
 ARG RUN_JAVA_VERSION=1.3.8

diff --git a/app/src/main/docker/Dockerfile.native b/app/src/main/docker/Dockerfile.native
@@ -14,7 +14,7 @@
 # docker run -i --rm -p 8080:8080 quarkus/app
 #
 ###
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1072
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
 WORKDIR /work/
 RUN chown 1001 /work \
     && chmod "g+rwX" /work \