diff --git a/charts/nr-metabase/templates/metabase/configmap.yaml b/charts/nr-metabase/templates/metabase/configmap.yaml index e714ad2..80baccc 100644 --- a/charts/nr-metabase/templates/metabase/configmap.yaml +++ b/charts/nr-metabase/templates/metabase/configmap.yaml @@ -21,6 +21,8 @@ data: + + @@ -68,7 +70,7 @@ data: if [ -f /config/log4j2.xml ]; then - java -Duser.name=metabase -Xms${MIN_HEAP} -Xmx${MAX_HEAP} -XX:TieredStopAtLevel=4 -XX:+UseZGC -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=350m -XX:+ExitOnOutOfMemoryError -Dlog4j.configurationFile=file:/config/log4j2.xml -jar metabase.jar + java -server -Duser.name=metabase -Xms${MIN_HEAP} -Xmx${MAX_HEAP} -XX:TieredStopAtLevel=4 -XX:+UseZGC -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=350m -XX:+ExitOnOutOfMemoryError -Dlog4j.configurationFile=file:/config/log4j2.xml -jar metabase.jar else - java -Duser.name=metabase -Xms${MIN_HEAP} -Xmx${MAX_HEAP} -XX:TieredStopAtLevel=4 -XX:+UseZGC -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=350m -XX:+ExitOnOutOfMemoryError -jar metabase.jar + java -server -Duser.name=metabase -Xms${MIN_HEAP} -Xmx${MAX_HEAP} -XX:TieredStopAtLevel=4 -XX:+UseZGC -XX:MinHeapFreeRatio=20 -XX:MaxHeapFreeRatio=40 -XX:GCTimeRatio=4 -XX:AdaptiveSizePolicyWeight=90 -XX:MaxMetaspaceSize=350m -XX:+ExitOnOutOfMemoryError -jar metabase.jar fi diff --git a/metabase/Dockerfile b/metabase/Dockerfile index ece5e95..2dae749 100644 --- a/metabase/Dockerfile +++ b/metabase/Dockerfile @@ -1,5 +1,5 @@ #This Dockerfile mounts the certs -FROM eclipse-temurin:21 +FROM eclipse-temurin:23 WORKDIR /app COPY ojdbc8-full /app/plugins/ ARG METABASE_VERSION @@ -12,8 +12,6 @@ bash curl wget \ && rm -rf /var/lib/apt/lists/* RUN wget -q https://downloads.metabase.com/${METABASE_VER}/metabase.jar \ && chmod -R 777 /app -COPY InstallCert.class . -COPY "InstallCert\$SavingTrustManager.class" . RUN chmod -R 777 /opt && chmod -R 777 /etc/ca-certificates && chmod -R 777 "${JAVA_HOME}"/lib/security EXPOSE 3000 USER 185 diff --git a/metabase/InstallCert$SavingTrustManager.class b/metabase/InstallCert$SavingTrustManager.class deleted file mode 100644 index 2e86c3b..0000000 Binary files a/metabase/InstallCert$SavingTrustManager.class and /dev/null differ diff --git a/metabase/InstallCert.class b/metabase/InstallCert.class deleted file mode 100644 index 7206d22..0000000 Binary files a/metabase/InstallCert.class and /dev/null differ diff --git a/metabase/ojdbc8-full/sdoapi-11.2.0.jar b/metabase/ojdbc8-full/sdoapi-11.2.0.jar new file mode 100644 index 0000000..35887e9 Binary files /dev/null and b/metabase/ojdbc8-full/sdoapi-11.2.0.jar differ diff --git a/metabase/ojdbc8-full/sdoutl-11.2.0.jar b/metabase/ojdbc8-full/sdoutl-11.2.0.jar new file mode 100644 index 0000000..d380e50 Binary files /dev/null and b/metabase/ojdbc8-full/sdoutl-11.2.0.jar differ