-
-
Notifications
You must be signed in to change notification settings - Fork 8.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[JENKINS-52028] - Update Docker image baseline to 2.128 to pick Incre…
…mentals support
- Loading branch information
1 parent
a17e5cb
commit a52eb36
Showing
2 changed files
with
2 additions
and
17 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,21 +1,6 @@ | ||
#! /bin/bash -e | ||
# Additional wrapper, which adds custom environment options for the run (if needed) | ||
|
||
# Lazy debug | ||
extra_java_opts=() | ||
if [[ "$DEBUG" ]] ; then | ||
extra_java_opts+=( \ | ||
'-Xdebug' \ | ||
'-Xrunjdwp:server=y,transport=dt_socket,address=5005,suspend=y' \ | ||
) | ||
fi | ||
|
||
if [ ${#extra_java_opts[@]} -eq 0 ]; then | ||
if [ -n "$JAVA_OPTS" ] ; then | ||
export JAVA_OPTS="$JAVA_OPTS ${extra_java_opts[@]}" | ||
else | ||
export JAVA_OPTS="${extra_java_opts[@]}" | ||
fi | ||
fi | ||
# Just a placeholder so that we can quickly add extra options if needed | ||
|
||
exec /usr/local/bin/jenkins.sh "$@" |