Addressing review feedback

Author: Josh-Matsuoka

modules/jlink/artifacts/opt/jboss/container/java/jlink/Dockerfile

@@ -5,10 +5,12 @@ set -euo pipefail
 outdir="${outdir-spring-boot-jre}"
 depsfile="module-deps.txt"
 
-test -f $depsfile
-modules="$(cat $depsfile)"
+function generate_jre_image() {
+	test -f $depsfile
+	modules="$(cat $depsfile)"
 
-$JAVA_HOME/bin/jlink --output "${outdir}/jre" \
-       	--add-modules "$modules" \
-	--strip-debug --no-header-files --no-man-pages \
-	--compress=2
+	$JAVA_HOME/bin/jlink --output "${outdir}/jre" \
+    	   	--add-modules "$modules" \
+		--strip-debug --no-header-files --no-man-pages \
+		--compress=2
+}

modules/jlink/artifacts/opt/jboss/container/java/jlink/README.md

@@ -8,24 +8,18 @@ source "${JBOSS_CONTAINER_MAVEN_S2I_MODULE}/maven-s2i"
 # include our s2i_core_*() overrides/extensions
 source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"
 
+# inject our overridden maven_s2i_*() functions
+source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/maven-s2i-overrides"
+
 # include our jlink scripts
 source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
 source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh"
 source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/runall.sh"
-#TODO: Are all of these needed or can we just invoke runall?
-
-# inject our overridden maven_s2i_*() functions
-source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/maven-s2i-overrides"
+source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
 
 # invoke the build
 maven_s2i_build
 
-#TODO: Clean this up to call the scripts instead
-
-shopt -s globstar
-
 echo "Checking that jarfile and libdir exist"
 test -f "$JAVA_APP_JAR"
 test -d "$JAVA_LIB_DIR"
@@ -40,8 +34,4 @@ echo "Generating JDK dependencies"
 generatejdkdeps
 
 echo "Linking jre"
-$JAVA_HOME/bin/jlink --output runtime-jre \
-      	--add-modules $(cat module-deps.txt) \
-        -G --no-header-files --no-man-pages
-
-rm *.txt
+generate_jre_image

modules/jlink/artifacts/opt/jboss/container/java/jlink/mkjreimage.sh

@@ -49,7 +49,6 @@ modules:
   - name: jboss.container.maven
     version: "3.8.11"
   - name: jboss.container.java.s2i.bash
-  - name: jboss.container.java.jlink
 
 help:
   add: true

modules/s2i/bash/artifacts/usr/local/s2i/assemble

@@ -49,7 +49,6 @@ modules:
   - name: jboss.container.maven
     version: "3.8.17"
   - name: jboss.container.java.s2i.bash
-  - name: jboss.container.java.jlink
 
 help:
   add: true