Ability to run JAVA_HOME binaries inside test (#24)

* java home binaries

* update

* update

* update

* update

* update

* ls

* update

* update

* update

.gitignore

@@ -1 +1,2 @@
 bazel-*
+.ijwb

README.md

@@ -94,7 +94,7 @@ junit_docker_compose_test(
     test_srcs = glob(["**/*Test.java"]),
     test_deps = ["@maven//:org_junit_jupiter_junit_jupiter_api"],
     classpath_jars = ["@maven//:org_junit_platform_junit_platform_console_standalone"],
-    test_image_base = "@distroless_java",
+    test_image_base = "@openjdk",
 )
 ```
 

docker_compose_test/test_container_entrypoint.sh

@@ -13,14 +13,20 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+echo "[DEBUG] JAVA_HOME before discovery logic: $JAVA_HOME"
+
 # if JAVA_HOME is not set, just default to /usr (works if /usr/bin/java exists)
 if [[ -z "$JAVA_HOME" ]]; then
-    JAVA_HOME="/usr"
+    export JAVA_HOME="/usr"
 # this is used if JAVA_HOME contains an * (if version changes regularly this can be useful)
-elif [[ "$JAVA_HOME" == *"\*"* ]]; then
-    JAVA_HOME=$(find $JAVA_HOME -maxdepth 1 | head -n 1)
+elif echo "$JAVA_HOME" | grep '*' > /dev/null; then
+    export JAVA_HOME=$(find $JAVA_HOME -maxdepth 1 | head -n 1)
 fi
 
+echo "[DEBUG] JAVA_HOME after discovery logic: $JAVA_HOME"
+export PATH=$JAVA_HOME/bin:$PATH
+echo "[DEBUG] PATH: $PATH"
+
 TEST_UBER_JAR=$(find ./ -maxdepth 1 -name '*_uber_jar_deploy.jar')
 JUNIT_PLATFORM_CONSOLE_STANDALONE_JAR=$(find ./ -maxdepth 1 -name '*junit-platform-console-standalone*.jar')
 

examples/.bazelrc

@@ -0,0 +1,2 @@
+common --test_output=errors
+common --verbose_explanations

examples/WORKSPACE

@@ -50,10 +50,13 @@ oci_register_toolchains(
 load("@rules_oci//oci:pull.bzl", "oci_pull")
 
 oci_pull(
-    name = "distroless_java",
-    # tag = "debug", # debug distroless image can be debugged with --entrypoint "/busybox/sh"
-    digest = "sha256:73c3687a9d7277f480a560ae380ba16acbe8eb5a0f459560b4466bb71e6288a1",
-    image = "gcr.io/distroless/java17",
+    name = "openjdk",
+    digest = "sha256:29c44ad7bb159a29a4458b74e8d37c1995cb8dc32abdd35e6d3e3d493e682d10",
+    image = "openjdk",
+    platforms = [
+        "linux/amd64",
+        "linux/arm64/v8",
+    ],
 )
 
 oci_pull(

examples/junit-image-test/BUILD

@@ -22,5 +22,5 @@ junit_docker_compose_test(
     test_srcs = glob(["**/*Test.java"]),
     test_deps = ["@maven//:org_junit_jupiter_junit_jupiter_api"],
     classpath_jars = ["@maven//:org_junit_platform_junit_platform_console_standalone"],
-    test_image_base = "@distroless_java",
+    test_image_base = "@openjdk",
 )

examples/junit-image-test/HelloTest.java

@@ -18,13 +18,20 @@
 package com.salesforce.rules_docker_compose_test.HelloTest;
 
 import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import java.io.IOException;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class HelloTest {
 
     @Test
-     void helloWorldContainsHello() {
+     void helloWorldContainsHello() throws IOException, InterruptedException {
+        // Testing that the $JAVA_HOME/bin binaries are available
+        ProcessBuilder processBuilder = new ProcessBuilder(new String[]{"sh", "-c", "jstat --help"});
+        Process process = processBuilder.start();
+        int exitValue = process.waitFor();
+        assertEquals(0, exitValue);
         assertTrue("Hello World!".contains("Hello"));
     }
-}
+}

examples/junit-image-test/docker-compose.yml

@@ -16,6 +16,6 @@
 services:
   test_container:
     image: junit-image-test:test_container
-    entrypoint: ["/busybox/sh", "./test_container_entrypoint.sh"]
+    entrypoint: ["/bin/bash", "./test_container_entrypoint.sh"]
     environment:
-      - JAVA_HOME=/usr/
+      - JAVA_HOME=/usr/local/openjdk-*

examples/locally-built-image-test/BUILD

@@ -25,7 +25,7 @@ pkg_tar(
 
 oci_image(
     name = "java_image",
-    base = "@distroless_java",
+    base = "@openjdk",
     tars = [
       ":files",
     ],