Cleanup

Author: Josh-Matsuoka

modules/jlink/artifacts/opt/jboss/container/java/s2i/generatejdkdeps.sh

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-$JAVA_HOME/bin/java --list-modules > java-modules.txt
-< java-modules.txt sed "s/\\@.*//" > modules.txt
-grep -Fx -f stripped-deps.txt modules.txt | tr '\n' ',' | tr -d "[:space:]" > module-deps.txt
-echo "jdk.zipfs" >> module-deps.txt
+function generatejdkdeps() {
+  $JAVA_HOME/bin/java --list-modules > java-modules.txt
+  < java-modules.txt sed "s/\\@.*//" > modules.txt
+  grep -Fx -f stripped-deps.txt modules.txt | tr '\n' ',' | tr -d "[:space:]" > module-deps.txt
+  echo "jdk.zipfs" >> module-deps.txt
+}

modules/jlink/artifacts/opt/jboss/container/java/s2i/mkdeps.sh

@@ -2,20 +2,24 @@
 set -euo pipefail
 shopt -s globstar
 
+#TODO: 
 project="${project-spring-boot-sample-simple}"
 jarfile="${jarfile-$project/target/spring-boot-sample-simple-1.5.0.BUILD-SNAPSHOT.jar}"
 libdir="${libdir-$project/target/lib}"
 
-test -f "$jarfile"
-test -d "$libdir"
+function generate_deps() {
+  #Test that file dependencies exist
+  test -f "$jarfile"
+  test -d "$libdir"
 
-# Create a temporary directory for a module path
-# This works around "Module java.xml.bind not found, required by java.ws.rs"
-mkdir dependencies
-find $libdir -type f -name '*.jar' -print0 | xargs -r0 cp -vt dependencies
+  # Create a temporary directory for a module path
+  # This works around "Module java.xml.bind not found, required by java.ws.rs"
+  mkdir dependencies
+  find $libdir -type f -name '*.jar' -print0 | xargs -r0 cp -vt dependencies
 
-$JAVA_HOME/bin/jdeps --multi-release 11 -R -s \
+  $JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \
     --module-path dependencies \
     "$jarfile" \
     "$libdir"/**/*.jar \
-> deps.txt
+    > deps.txt
+}

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

@@ -1,4 +1,5 @@
 #!/bin/bash
+# TODO: Still Needed?
 set -euo pipefail
 
 outdir="${outdir-spring-boot-jre}"

modules/jlink/artifacts/opt/jboss/container/java/s2i/mkstrippeddeps.sh

@@ -1,13 +1,14 @@
 #!/bin/bash
 set -euo pipefail
 
-test -f deps.txt
-
-<deps.txt \
-  grep 'java\|jdk\.'  | # mostly removes target/, but also jdk8internals
-  sed -E "s/Warning: .*//" | #remove extraneous warnings
-  sed -E "s/.*-> //"  | # remove src of src -> dep
-  sed -E "s/.*\.jar//" | # remove extraneous dependencies
-  sed "s#/.*##"       | # delete anything after a slash. in practice target/..
-  sort | uniq |
-tee stripped-deps.txt
+function mkstrippeddeps() {
+  test -f deps.txt
+  <deps.txt \
+    grep 'java\|jdk\.'  | # mostly removes target/, but also jdk8internals
+    sed -E "s/Warning: .*//" | #remove extraneous warnings
+    sed -E "s/.*-> //"  | # remove src of src -> dep
+    sed -E "s/.*\.jar//" | # remove extraneous dependencies
+    sed "s#/.*##"       | # delete anything after a slash. in practice target/..
+    sort | uniq |
+  tee stripped-deps.txt
+}

modules/jlink/artifacts/opt/jboss/container/java/s2i/runall.sh

@@ -8,6 +8,14 @@ source "${JBOSS_CONTAINER_MAVEN_S2I_MODULE}/maven-s2i"
 # include our s2i_core_*() overrides/extensions
 source "${JBOSS_CONTAINER_JAVA_S2I_MODULE}/s2i-core-hooks"
 
+# include our jlink scripts
+source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps"
+source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage"
+source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps"
+source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps"
+source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/runall"
+#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"
 
@@ -18,48 +26,25 @@ maven_s2i_build
 
 shopt -s globstar
 echo "Setting environment variables"
-jarfile="/deployments/*.jar"
-libdir="/deployments/lib"
-$JAVA_HOME/
+jarfile=$JAVA_APP_JAR
+libdir=$JAVA_LIB_DIR
 
 echo "Checking that jarfile and libdir exist"
 test -f "$jarfile"
 test -d "$libdir"
 
-# Create a temporary directory for a module path
-mkdir dependencies
-cp /deployments/lib/**/*.jar dependencies
-# Calculate dependencies
-$JAVA_HOME/bin/jdeps --module-path dependencies --ignore-missing-deps --multi-release 11 -R -s \
-    "$jarfile" \
-    "$libdir"/**/*.jar \
-> deps.txt
-# Clean up temporary directory
-rm -rf dependencies
+echo "Invoking mkdeps"
+generate_deps
 
-# Strip down the dependencies to the ones we're looking for
-<deps.txt \
-  grep 'java\|jdk\.'  | # mostly removes target/, but also jdk8internals
-  sed -E "s/Warning: .*//" | #remove extraneous warnings
-  sed -E "s/.*-> //"  | # remove src of src -> dep
-  sed -E "s/.*\.jar//" | # remove extraneous dependencies
-  sed "s#/.*##"       | # delete anything after a slash. in practice target/..
-  sort | uniq |
-tee stripped-deps.txt
+echo "Stripping dependencies"
+mkstrippeddeps
 
-echo "Checking against jdk modules"
-$JAVA_HOME/bin/java --list-modules > java-modules.txt
-cat java-modules.txt | sed "s/\\@.*//" > modules.txt
-grep -Fx -f stripped-deps.txt modules.txt | tr '\n' ',' | tr -d "[:space:]" > module-deps.txt
-echo "jdk.zipfs" >> module-deps.txt
+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
-echo "Repacking jre"
-INSTALL_BASE="/lib/jvm/java-11-openjdk"
-JDK_IMAGE="runtime-jre"
-echo -n "Replacing shared libraries from JDK image '$JDK_IMAGE' with shared libraries from '$INSTALL_BASE'... "
+rm *.txt

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

@@ -33,7 +33,7 @@ function s2i_core_env_init() {
   S2I_IMAGE_SOURCE_MOUNTS="${S2I_IMAGE_SOURCE_MOUNTS:-${CUSTOM_INSTALL_DIRECTORIES}}"
   S2I_ENABLE_INCREMENTAL_BUILDS="${S2I_ENABLE_INCREMENTAL_BUILDS:-true}"
   S2I_DELETE_SOURCE="${S2I_DELETE_SOURCE:-true}"
-  S2I_ENABLE_JLINK="${S2I_ENABLE_JLINK:-true}"
+  S2I_ENABLE_JLINK="${S2I_ENABLE_JLINK:-false}"
 }
 
 # extensions may override this method to initialize environment variables

modules/s2i/core/artifacts/opt/jboss/container/s2i/core/s2i-core

@@ -112,7 +112,7 @@ envs:
     Delete source files at the end of build.  Defaults to true.
   example: "false"
 
-- name: S2I_ENABLE_JLINK_WORKFLOW
+- name: S2I_ENABLE_JLINK
   description: ^
     Enables the Jdeps/JLink workflow to minimize JRE size
   example: "false"