Fixing ordering

Author: Josh-Matsuoka

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

@@ -3,18 +3,25 @@ set -euo pipefail
 shopt -s globstar
 
 function generate_deps() {
-  #Test that file dependencies exist
-  test -f "$JAVA_APP_JAR"
-  test -d "$JAVA_LIB_DIR"
-
   # 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 $JAVA_LIB_DIR -type f -name '*.jar' -print0 | xargs -r0 cp -vt dependencies
 
-  $JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \
-    --module-path dependencies \
-    "$JAVA_APP_JAR" \
-    "$JAVA_LIB_DIR"/**/*.jar \
-    > deps.txt
+  if [[ -v JAVA_LIB_DIR ]]; then
+      # copy dependencies found in libs to dependencies
+      find $JAVA_LIB_DIR -type f -name '*.jar' -print0 | xargs -r0 cp -vt dependencies
+      # generate the dependency list
+      $JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \
+        --module-path dependencies \
+        "$JAVA_APP_JAR" \
+        "$JAVA_LIB_DIR"/**/*.jar \
+        > deps.txt
+      cat deps.txt
+  else 
+    $JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \
+      --module-path dependencies \
+      "$JAVA_APP_JAR" \
+      > deps.txt
+    cat deps.txt
+  fi
 }

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

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

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

@@ -2,13 +2,18 @@
 set -euo pipefail
 
 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
+  if [ -f "deps.txt" ]; then 
+    echo "deps exists, filtering"
+    <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 complete"
+  else
+    echo "deps does not exist"
+  fi
 }

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

@@ -11,27 +11,22 @@ 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}/mkstrippeddeps.sh"
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
-source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
-
 # invoke the build
 maven_s2i_build
 
-echo "Checking that jarfile and libdir exist"
-test -f "$JAVA_APP_JAR"
-test -d "$JAVA_LIB_DIR"
-
+# include our jlink scripts
+source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
 echo "Invoking mkdeps"
 generate_deps
 
+source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh"
 echo "Stripping dependencies"
 mkstrippeddeps
 
+source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
 echo "Generating JDK dependencies"
 generatejdkdeps
 
+source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
 echo "Linking jre"
 generate_jre_image

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

@@ -82,18 +82,21 @@ function s2i_core_copy_data() {
 # copy deployment (binary) files
 # $1 - the base directory to which $S2I_SOURCE_DEPLOYMENTS_DIR is appended
 function s2i_core_copy_deployments() {
+  echo "Copying deployments"
   if [ -d "${1}/${S2I_SOURCE_DEPLOYMENTS_DIR}" ]; then
     if [ -z "${S2I_TARGET_DEPLOYMENTS_DIR}" ]; then
       log_warning "Unable to copy deployment files.  No target directory specified for S2I_TARGET_DEPLOYMENTS_DIR"
     else
       if [ ! -d "${S2I_TARGET_DEPLOYMENTS_DIR}" ]; then
         log_info "S2I_TARGET_DEPLOYMENTS_DIR does not exist, creating ${S2I_TARGET_DEPLOYMENTS_DIR}"
         mkdir -pm 775 "${S2I_TARGET_DEPLOYMENTS_DIR}"
+        echo "created $S2I_TARGET_DEPLOYMENTS_DIR"
       fi
       local relative_source=$(realpath --relative-to "${S2I_SOURCE_DIR}" "${1}/${S2I_SOURCE_DEPLOYMENTS_DIR}")
       log_info "Copying deployments from $relative_source to ${S2I_TARGET_DEPLOYMENTS_DIR}..."
       for filter in ${S2I_SOURCE_DEPLOYMENTS_FILTER:-*}; do
         find "${S2I_SOURCE_DIR}/${relative_source}/" -maxdepth 1 -name "${filter}" | xargs -I '{}' -r cp -Lrpv '{}' "${S2I_TARGET_DEPLOYMENTS_DIR}"
+        echo "Copying $filter to $S2I_TARGET_DEPLOYMENTS_DIR"
       done
     fi
   fi