fix: JVM support on Kube (#3074)

block · Oct 10, 2024 · d75804a · d75804a
1 parent 54bb6e2
commit d75804a
Show file tree

Hide file tree

Showing 33 changed files with 45 additions and 44 deletions.
diff --git a/Dockerfile.box b/Dockerfile.box
@@ -6,12 +6,10 @@ RUN apt-get install -y curl git zip
 COPY ./bin /src/bin
 ENV PATH="/src/bin:$PATH"
 ENV HERMIT_STATE_DIR=/hermit
-RUN hermit uninstall jbr
-RUN hermit install openjre-18.0.2.1_1
+RUN hermit install openjdk-17.0.8_7
 # openjre and jbr conflict, but we want the JRE in the cache
-RUN hermit uninstall openjre
-RUN hermit install jbr
 RUN go version
+RUN java -version
 
 WORKDIR /src
 
@@ -33,7 +31,7 @@ FROM ubuntu:24.04
 WORKDIR /root/
 
 ENV PATH="/root/jre/bin:$PATH"
-COPY --from=builder /hermit/pkg/openjre-18.0.2.1_1/ ./jre/
+COPY --from=builder /hermit/pkg/openjdk-17.0.8_7/ ./jre/
 COPY --from=builder /src/build/release/ftl .
 RUN mkdir deployments
 # Where the module artifacts are stored

diff --git a/Dockerfile.runner b/Dockerfile.runner
@@ -6,11 +6,7 @@ RUN apt-get install -y curl git zip
 COPY ./bin /src/bin
 ENV PATH="/src/bin:$PATH"
 ENV HERMIT_STATE_DIR=/hermit
-RUN hermit uninstall jbr
-RUN hermit install openjre-18.0.2.1_1
-# openjre and jbr conflict, but we want the JRE in the cache
-RUN hermit uninstall openjre
-RUN hermit install jbr
+RUN hermit install openjdk-17.0.8_7
 RUN go version
 RUN mvn -B --version
 
@@ -36,8 +32,9 @@ RUN apt-get install -y ca-certificates
 
 WORKDIR /root/
 
-ENV PATH="/root/jre/bin:$PATH"
-COPY --from=builder /hermit/pkg/openjre-18.0.2.1_1/ ./jre/
+ENV PATH="/root/jdk/bin:$PATH"
+ENV JAVA_HOME="/root/jdk"
+COPY --from=builder /hermit/pkg/openjdk-17.0.8_7/ /root/jdk/
 COPY --from=builder /src/build/release/ftl-runner .
 COPY --from=builder /src/build/release/ftl .
 RUN mkdir deployments

diff --git a/bin/.jbr-17.0.6.b469.82.pkg → bin/.openjdk-17.0.8_7.pkg b/bin/.jbr-17.0.6.b469.82.pkg → bin/.openjdk-17.0.8_7.pkg
diff --git a/bin/jar b/bin/jar
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jarsigner b/bin/jarsigner
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/java b/bin/java
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/javac b/bin/javac
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/javadoc b/bin/javadoc
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/javap b/bin/javap
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jcmd b/bin/jcmd
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jconsole b/bin/jconsole
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jdb b/bin/jdb
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jdeprscan b/bin/jdeprscan
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jdeps b/bin/jdeps
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jfr b/bin/jfr
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jhsdb b/bin/jhsdb
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jimage b/bin/jimage
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jinfo b/bin/jinfo
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jlink b/bin/jlink
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jmap b/bin/jmap
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jmod b/bin/jmod
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jpackage b/bin/jpackage
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jps b/bin/jps
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jrunscript b/bin/jrunscript
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jshell b/bin/jshell
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jstack b/bin/jstack
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jstat b/bin/jstat
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/jstatd b/bin/jstatd
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/keytool b/bin/keytool
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/rmiregistry b/bin/rmiregistry
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/bin/serialver b/bin/serialver
@@ -1 +1 @@
-.jbr-17.0.6.b469.82.pkg
+.openjdk-17.0.8_7.pkg
diff --git a/deployment/Dockerfile.runner.test b/deployment/Dockerfile.runner.test
@@ -1,9 +1,15 @@
+FROM ubuntu:24.04 AS builder
+RUN apt-get update
+
+WORKDIR /src
+
+# Finally create the runtime image.
 FROM ubuntu:24.04
+RUN apt-get update
+RUN apt-get install -y ca-certificates openjdk-17-jdk
 
 WORKDIR /root/
 
-#this image does not have a JRE, only test golang on kube
-
 COPY docker-build/ftl-runner .
 COPY docker-build/ftl .
 RUN mkdir deployments
@@ -12,6 +18,5 @@ EXPOSE 8894
 
 ENV FTL_ENDPOINT="http://host.docker.internal:8892"
 ENV FTL_RUNNER_BIND="http://0.0.0.0:8893"
-ENV FTL_RUNNER_ADVERTISE="http://127.0.0.1:8893"
 
-CMD ["/root/ftl-runner",  "--deployment-dir=deployments"]
+CMD ["/root/ftl-runner", "--deployment-dir=deployments"]
diff --git a/deployment/Justfile b/deployment/Justfile
@@ -113,6 +113,7 @@ ftl-status:
 build-executables:
   # we build locally then copy into the docker files
   # it is way faster than building in the docker files
+  java -version #make sure hermit has downloaded Java
   mkdir -p "docker-build"
   cd ../ && GOARCH=amd64 GOOS=linux CGO_ENABLED=0 just build ftl-controller ftl-runner ftl-initdb ftl
   cp ../build/release/* ./docker-build/