From 4e589a84d4fdf911815414a56fe510ca7e04dfed Mon Sep 17 00:00:00 2001 From: jmatsuok Date: Mon, 20 Jan 2025 17:50:01 -0500 Subject: [PATCH 1/2] Ensure the build fails when jdeps fails --- .../s2i/bash/artifacts/usr/local/s2i/assemble | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/modules/s2i/bash/artifacts/usr/local/s2i/assemble b/modules/s2i/bash/artifacts/usr/local/s2i/assemble index 76999b56..e56fa4e1 100644 --- a/modules/s2i/bash/artifacts/usr/local/s2i/assemble +++ b/modules/s2i/bash/artifacts/usr/local/s2i/assemble @@ -1,6 +1,6 @@ #!/bin/sh -set -e +set -eo pipefail source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh" source "${JBOSS_CONTAINER_MAVEN_S2I_MODULE}/maven-s2i" @@ -26,18 +26,30 @@ if [ "$S2I_ENABLE_JLINK" = "true" ]; then source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh" echo "Invoking mkdeps" - generate_deps + generate_deps || { + log_error "mkdeps failed, return code: $1" + exit $1 + } source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh" echo "Stripping dependencies" - mkstrippeddeps + mkstrippeddeps || { + log_error "stripping dependencies failed, return code: $1" + exit $1 + } source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh" echo "Generating JDK dependencies" - generatejdkdeps + generatejdkdeps || { + log_error "generating JDK dependencies failed, return code: $1" + exit $1 + } source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh" echo "Linking jre" - generate_jre_image + generate_jre_image || { + log_error "Linking JRE failed, return code: $1" + exit $1 + } fi From 5f046918548bd24955a8e05e284f53dd3d11f23b Mon Sep 17 00:00:00 2001 From: jmatsuok Date: Tue, 28 Jan 2025 18:15:35 -0500 Subject: [PATCH 2/2] Fix return code handling --- .../opt/jboss/container/java/jlink/mkdeps.sh | 5 +---- .../s2i/bash/artifacts/usr/local/s2i/assemble | 16 ++++++++-------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh b/modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh index bc9d55ba..7a53e782 100755 --- a/modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh +++ b/modules/jlink/artifacts/opt/jboss/container/java/jlink/mkdeps.sh @@ -21,10 +21,7 @@ function generate_deps() { --module-path dependencies \ "$JAVA_APP_JAR" \ "$JAVA_LIB_DIR"/**/*.jar \ - > deps.txt || { - echo "jdeps failed: return code $?" - exit $? - } + > deps.txt else $JAVA_HOME/bin/jdeps --multi-release $JAVA_VERSION -R -s \ --module-path dependencies \ diff --git a/modules/s2i/bash/artifacts/usr/local/s2i/assemble b/modules/s2i/bash/artifacts/usr/local/s2i/assemble index c77ee026..81dd72eb 100644 --- a/modules/s2i/bash/artifacts/usr/local/s2i/assemble +++ b/modules/s2i/bash/artifacts/usr/local/s2i/assemble @@ -28,29 +28,29 @@ if [ "$S2I_ENABLE_JLINK" = "true" ]; then source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh" echo "Invoking mkdeps" generate_deps || { - log_error "mkdeps failed, return code: $1" - exit $1 + log_error "mkdeps failed, return code: $?" + exit 1 } source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh" echo "Stripping dependencies" mkstrippeddeps || { - log_error "stripping dependencies failed, return code: $1" - exit $1 + log_error "stripping dependencies failed, return code: $?" + exit 1 } source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh" echo "Generating JDK dependencies" generatejdkdeps || { - log_error "generating JDK dependencies failed, return code: $1" - exit $1 + log_error "generating JDK dependencies failed, return code: $?" + exit 1 } source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh" echo "Linking jre" generate_jre_image || { - log_error "Linking JRE failed, return code: $1" - exit $1 + log_error "Linking JRE failed, return code: $?" + exit 1 } fi