Skip to content

Commit 4d9f070

Browse files
authored
Expose FIPS_CLASSPATH (#43)
1 parent 2f811e4 commit 4d9f070

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

hypertrace-gradle-docker-java-application-plugin/src/main/resources/application-start-script.template.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@
2323

2424
set -e
2525

26-
CLASSPATH="/app/resources:/app/classes:/app/localLibs/*:/app/orgLibs/*:/app/externalLibs/*"
27-
if [ "\$FIPS_ENABLED" = "true" ]; then
28-
CLASSPATH="/usr/share/java/bc-fips/*:\${CLASSPATH}"
29-
echo "Adding the additional FIPS libs to the classpath"
30-
fi
31-
26+
# Remove trailing colon if present
27+
FIPS_CLASSPATH="\${FIPS_CLASSPATH%:}"
28+
# If FIPS_CLASSPATH is not empty, prepend it to classpath with colon as delim
29+
CLASSPATH="\${FIPS_CLASSPATH:+\${FIPS_CLASSPATH}:}/app/resources:/app/classes:/app/localLibs/*:/app/orgLibs/*:/app/externalLibs/*"
30+
echo "Using the classpath \$CLASSPATH"
3231
exec java ${defaultJvmOpts.substring(1, defaultJvmOpts.length()-1)} \$JAVA_OPTS \$FIPS_JAVA_OPTS -classpath \${CLASSPATH} ${mainClassName} \$@

0 commit comments

Comments
 (0)