Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-52028] - Update Java 10 Docker image baseline to 2.128 to pick Incrementals support #3507

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN mvn clean install --batch-mode -Plight-test

# The image is based on https://github.com/jenkinsci/docker/tree/java10
# All documentation is applicable
FROM jenkins/jenkins-experimental:2.127-jdk10
FROM jenkins/jenkins-experimental:2.128-jdk10

LABEL Description="This is an experimental image for Jenkins on Java 10"

Expand Down
17 changes: 1 addition & 16 deletions docker/jenkins2.sh
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 "$@"