From 6c23bedeb62632decc99094372060b833fa777b3 Mon Sep 17 00:00:00 2001 From: "Brian M. Long" Date: Wed, 20 May 2026 16:30:43 -0400 Subject: [PATCH] switch to debian base --- Containerfile | 4 +--- pom.xml | 7 +++---- src/main/containerd/containerd-entrypoint.sh | 11 +++++------ src/main/containerd/setenv.sh | 2 ++ 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/Containerfile b/Containerfile index d195120..04c4488 100644 --- a/Containerfile +++ b/Containerfile @@ -1,11 +1,9 @@ -FROM ubuntu:${ubuntu.version} +FROM debian:${debian.version}-slim # Configure standard JAVA parameters ENV JAVA_MEMORY_INIT=128m ENV JAVA_MEMORY_MAX=512m -ENV JAVA_HOME=/usr/local/lib/jvm/java-openjdk-jbr -ENV JRE_HOME=/usr/local/lib/jvm/java-openjdk-jbr ENV JAVA_OPTS= ENV ENABLE_HOTSWAP=true ENV ENABLE_JDWP=true diff --git a/pom.xml b/pom.xml index f527bc7..74e4c95 100644 --- a/pom.xml +++ b/pom.xml @@ -8,10 +8,9 @@ pom - - - - 25.04 + + + 12.14 ${project.artifactId} diff --git a/src/main/containerd/containerd-entrypoint.sh b/src/main/containerd/containerd-entrypoint.sh index 17bad74..1330396 100644 --- a/src/main/containerd/containerd-entrypoint.sh +++ b/src/main/containerd/containerd-entrypoint.sh @@ -1,9 +1,8 @@ #!/bin/sh . /usr/local/bin/${namespace.prefix}-setenv.sh -JAVA_CP="/var/lib/jvm/lib:/var/lib/jvm/lib/*" -JAVA_CP="${JAVA_CP}:/var/lib/jvm/dev/classes:/var/lib/jvm/dev/classes-extra1:/var/lib/jvm/dev/classes-extra2:/var/lib/jvm/dev/classes-extra3:/var/lib/jvm/dev/classes-extra4:/var/lib/jvm/dev/classes-extra5:/var/lib/jvm/dev/classes-extra6:/var/lib/jvm/dev/classes-extra7" -JAVA_CP="${JAVA_CP}:/var/lib/jvm/dev/lib/*:/var/lib/jvm/dev/lib-extra1/*:/var/lib/jvm/dev/lib-extra2/*:/var/lib/jvm/dev/lib-extra3/*:/var/lib/jvm/dev/lib-extra4/*:/var/lib/jvm/dev/lib-extra5/*:/var/lib/jvm/dev/lib-extra6/*:/var/lib/jvm/dev/lib-extra7/*" -EXEC_JAVA_OPTS="${JAVA_OPTS} -classpath ${JAVA_CP}" - -exec ${JAVA_HOME}/bin/java ${EXEC_JAVA_OPTS} ${JAVA_CLASS} +if [ -z $1 ]; then + exec /bin/bash +else + exec ${JAVA_HOME}/bin/java $@ +fi diff --git a/src/main/containerd/setenv.sh b/src/main/containerd/setenv.sh index b4257c6..8504d70 100644 --- a/src/main/containerd/setenv.sh +++ b/src/main/containerd/setenv.sh @@ -1,4 +1,6 @@ #!/bin/sh +JAVA_HOME=/usr/local/lib/jvm/java-openjdk-jbr +JRE_HOME=/usr/local/lib/jvm/java-openjdk-jbr JAVA_OPTS="${JAVA_OPTS} -Xms${JAVA_MEMORY_INIT} -Xmx${JAVA_MEMORY_MAX}" if [ "${ENABLE_HOTSWAP}" = "true" ]; then