Cleanup

Author: Josh-Matsuoka

modules/jlink/artifacts/opt/jboss/container/java/s2i/Dockerfile renamed to modules/jlink/artifacts/opt/jboss/container/java/jlink/Dockerfile

@@ -2,22 +2,19 @@
 set -euo pipefail
 shopt -s globstar
 
-jarfile=$JAVA_APP_JAR
-libdir=$JAVA_LIB_DIR
-
 function generate_deps() {
   #Test that file dependencies exist
-  test -f "$jarfile"
-  test -d "$libdir"
+  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 $libdir -type f -name '*.jar' -print0 | xargs -r0 cp -vt 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 \
-    "$jarfile" \
-    "$libdir"/**/*.jar \
+    "$JAVA_APP_JAR" \
+    "$JAVA_LIB_DIR"/**/*.jar \
     > deps.txt
 }

modules/jlink/artifacts/opt/jboss/container/java/s2i/README.md renamed to modules/jlink/artifacts/opt/jboss/container/java/jlink/README.md

@@ -7,7 +7,7 @@ ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
 
 chown -R default:root $SCRIPT_DIR
 chmod -R ug+rwX $SCRIPT_DIR
-chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/s2i/*
+chmod ug+x ${ARTIFACTS_DIR}/opt/jboss/container/java/jlink/*
 
 pushd ${ARTIFACTS_DIR}
 cp -pr * /

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

@@ -6,9 +6,13 @@ description: ^
   "Provides support for building custom JREs with a slimmed
   down set of modules by making use of Jdeps and Jlink"
 
+execute:
+- script: configure.sh
+
 envs: 
 - name: JBOSS_CONTAINER_JAVA_JLINK_MODULE
   value: /opt/jboss/container/java/jlink
 
-execute:
-- script: configure.sh
+modules:
+  install: 
+  - name: jboss.container.java.run

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

@@ -9,11 +9,11 @@ source "${JBOSS_CONTAINER_MAVEN_S2I_MODULE}/maven-s2i"
 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"
+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
@@ -25,13 +25,10 @@ maven_s2i_build
 #TODO: Clean this up to call the scripts instead
 
 shopt -s globstar
-echo "Setting environment variables"
-jarfile=$JAVA_APP_JAR
-libdir=$JAVA_LIB_DIR
 
 echo "Checking that jarfile and libdir exist"
-test -f "$jarfile"
-test -d "$libdir"
+test -f "$JAVA_APP_JAR"
+test -d "$JAVA_LIB_DIR"
 
 echo "Invoking mkdeps"
 generate_deps