This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
commit 2ae394a7d2586d631a5a62d016f01aa3d537c67c
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Thu Sep 14 18:15:41 2023 -0400
Set images for #885
---
.../karavan-app/src/main/docker/Dockerfile.distroless | 18 ------------------
.../src/main/docker/{Dockerfile.jvm => Dockerfile.jdk} | 2 +-
.../main/docker/{Dockerfile.jvm => Dockerfile.minimal} | 2 +-
.../src/main/resources/application.properties | 6 ++----
4 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/docker/Dockerfile.distroless
b/karavan-web/karavan-app/src/main/docker/Dockerfile.distroless
deleted file mode 100644
index d8e8f265..00000000
--- a/karavan-web/karavan-app/src/main/docker/Dockerfile.distroless
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-FROM
gcr.io/distroless/java17@sha256:3a4ea21bd7b412b8b6ae61313b39337d8f03bb6844013810e8e4625d8c765edb
-COPY target/*-runner.jar /deployments/karavan.jar
-WORKDIR /deployments
-CMD ["karavan.jar"]
\ No newline at end of file
diff --git a/karavan-web/karavan-app/src/main/docker/Dockerfile.jvm
b/karavan-web/karavan-app/src/main/docker/Dockerfile.jdk
similarity index 86%
copy from karavan-web/karavan-app/src/main/docker/Dockerfile.jvm
copy to karavan-web/karavan-app/src/main/docker/Dockerfile.jdk
index 12684d5d..212a1cde 100644
--- a/karavan-web/karavan-app/src/main/docker/Dockerfile.jvm
+++ b/karavan-web/karavan-app/src/main/docker/Dockerfile.jdk
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17.0.8.1_1-jdk
+FROM eclipse-temurin:17-jdk
RUN mkdir /opt/app
COPY target/*-runner.jar /opt/app/karavan.jar
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0
-Djava.util.logging.manager=org.jboss.logmanager.LogManager"
diff --git a/karavan-web/karavan-app/src/main/docker/Dockerfile.jvm
b/karavan-web/karavan-app/src/main/docker/Dockerfile.minimal
similarity index 84%
rename from karavan-web/karavan-app/src/main/docker/Dockerfile.jvm
rename to karavan-web/karavan-app/src/main/docker/Dockerfile.minimal
index 12684d5d..83828912 100644
--- a/karavan-web/karavan-app/src/main/docker/Dockerfile.jvm
+++ b/karavan-web/karavan-app/src/main/docker/Dockerfile.minimal
@@ -1,4 +1,4 @@
-FROM eclipse-temurin:17.0.8.1_1-jdk
+FROM eclipse-temurin:17-jdk-ubi9-minimal
RUN mkdir /opt/app
COPY target/*-runner.jar /opt/app/karavan.jar
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0
-Djava.util.logging.manager=org.jboss.logmanager.LogManager"
diff --git a/karavan-web/karavan-app/src/main/resources/application.properties
b/karavan-web/karavan-app/src/main/resources/application.properties
index 47a60af3..ec175d4d 100644
--- a/karavan-web/karavan-app/src/main/resources/application.properties
+++ b/karavan-web/karavan-app/src/main/resources/application.properties
@@ -105,11 +105,9 @@ quarkus.http.enable-compression=true
quarkus.log.level=INFO
quarkus.banner.enabled=false
quarkus.package.type=uber-jar
-quarkus.docker.dockerfile-jvm-path=src/main/docker/Dockerfile.jvm
-#quarkus.docker.dockerfile-jvm-path=src/main/docker/Dockerfile.distroless
+quarkus.docker.dockerfile-jvm-path=src/main/docker/Dockerfile.jdk
+#quarkus.docker.dockerfile-jvm-path=src/main/docker/Dockerfile.minimal
quarkus.container-image.builder=docker
-#quarkus.jib.base-jvm-image=eclipse-temurin:17.0.8.1_1-jdk
-#quarkus.jib.ports=8080
quarkus.qute.strict-rendering=false
quarkus.qute.property-not-found-strategy=output-original
