Skip to content

Commit 4e589a8

Browse files
committed
Ensure the build fails when jdeps fails
1 parent 3dd45b2 commit 4e589a8

File tree

1 file changed

+17
-5
lines changed
  • modules/s2i/bash/artifacts/usr/local/s2i

1 file changed

+17
-5
lines changed

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

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
set -e
3+
set -eo pipefail
44

55
source "${JBOSS_CONTAINER_UTIL_LOGGING_MODULE}/logging.sh"
66
source "${JBOSS_CONTAINER_MAVEN_S2I_MODULE}/maven-s2i"
@@ -26,18 +26,30 @@ if [ "$S2I_ENABLE_JLINK" = "true" ]; then
2626

2727
source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkdeps.sh"
2828
echo "Invoking mkdeps"
29-
generate_deps
29+
generate_deps || {
30+
log_error "mkdeps failed, return code: $1"
31+
exit $1
32+
}
3033

3134
source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkstrippeddeps.sh"
3235
echo "Stripping dependencies"
33-
mkstrippeddeps
36+
mkstrippeddeps || {
37+
log_error "stripping dependencies failed, return code: $1"
38+
exit $1
39+
}
3440

3541
source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/generatejdkdeps.sh"
3642
echo "Generating JDK dependencies"
37-
generatejdkdeps
43+
generatejdkdeps || {
44+
log_error "generating JDK dependencies failed, return code: $1"
45+
exit $1
46+
}
3847

3948
source "${JBOSS_CONTAINER_JAVA_JLINK_MODULE}/mkjreimage.sh"
4049
echo "Linking jre"
41-
generate_jre_image
50+
generate_jre_image || {
51+
log_error "Linking JRE failed, return code: $1"
52+
exit $1
53+
}
4254

4355
fi

0 commit comments

Comments
 (0)