From 97e0cf8a7a26f906f224f286165b8ec361c85e03 Mon Sep 17 00:00:00 2001 From: Thomas Peetz Date: Sat, 31 Jan 2026 01:31:10 +0100 Subject: [PATCH] add kontor-javalin to podman pod --- kontor-javalin/{Dockerfile => Containerfile} | 10 +++---- .../src/main/java/de/thpeetz/kontor/Main.java | 2 +- script/setup | 27 +++++++++++++++++++ 3 files changed, 31 insertions(+), 8 deletions(-) rename kontor-javalin/{Dockerfile => Containerfile} (68%) diff --git a/kontor-javalin/Dockerfile b/kontor-javalin/Containerfile similarity index 68% rename from kontor-javalin/Dockerfile rename to kontor-javalin/Containerfile index 9e50434..7f94301 100644 --- a/kontor-javalin/Dockerfile +++ b/kontor-javalin/Containerfile @@ -1,5 +1,5 @@ # ----------------------------------------------------------------------- # -FROM gradle:9.2.1-jdk21 AS builder +FROM docker.io/library/gradle:9.2.1-jdk21 AS builder WORKDIR / COPY ./src/main/ ./src/main/ COPY ./build.gradle ./ @@ -13,13 +13,9 @@ FROM alpine/java:21-jre AS run RUN apk --no-cache add curl -RUN adduser --system appuser -USER appuser +COPY --from=builder /build/libs/kontor-javalin-0.2.0-SNAPSHOT.jar app.jar -COPY --from=builder --chown=appuser:appuser /build/libs/kontor-javalin-0.2.0-SNAPSHOT.jar app.jar - -EXPOSE 8400 -USER appuser +EXPOSE 8600 CMD ["java", "-jar", "app.jar"] diff --git a/kontor-javalin/src/main/java/de/thpeetz/kontor/Main.java b/kontor-javalin/src/main/java/de/thpeetz/kontor/Main.java index f6ffa6e..3081245 100644 --- a/kontor-javalin/src/main/java/de/thpeetz/kontor/Main.java +++ b/kontor-javalin/src/main/java/de/thpeetz/kontor/Main.java @@ -16,7 +16,7 @@ import io.javalin.config.Key; public class Main { private static Logger logger = LoggerFactory.getLogger(Main.class); - private static short port = 8400; + private static short port = 8600; // private static Key emf = new // Key("entityManagerFactory"); private static Key sf = new Key<>("SessionFactory"); diff --git a/script/setup b/script/setup index 61882c4..18fa871 100755 --- a/script/setup +++ b/script/setup @@ -25,6 +25,7 @@ else -p 8300:8300 \ -p 8400:8400 \ -p 8500:8500 \ + -p 8600:8600 \ -p 8900:8080 \ -p 61616:61616 \ -p 8161:8161 \ @@ -101,6 +102,7 @@ else --pod kontor \ --name kontor-spring \ --label "io.containers.autoupdate=local" \ + --label "PODMAN_SYSTEMD_UNIT=container-kontor-spring.service" \ localhost/kontor-spring:0.3.0 fi @@ -204,3 +206,28 @@ else localhost/kontor-fiber:0.3.0 fi +echo "==> Setting up container kontor-javalin" +if podman image exists localhost/kontor-javalin:0.3.0; then + echo " => Image localhost/kontor-javalin:0.3.0 available" +else + echo " => Baue Image localhost/kontor-javalin:0.3.0" + buildah build -t kontor-javalin:0.3.0 kontor-javalin +fi + +if podman container exists kontor-javalin; then + if podman ps -q --filter "name=kontor-javalin"; then + echo " => kontor-javalin is running" + fi +else + podman run -d \ + --replace \ + --pod kontor \ + --name kontor-javalin \ + --label "io.containers.autoupdate=local" \ + --label "PODMAN_SYSTEMD_UNIT=container-kontor-javalin.service" \ + --health-cmd='curl -f http://kontor-echo:8600/health || exit 1' \ + --health-interval=1s \ + --health-timeout=5s \ + --health-retries=10 \ + localhost/kontor-javalin:0.3.0 +fi