Skip to content

Commit

Permalink
[JENKINS-52028] - Update Docker image baseline to 2.128 to pick Incre…
Browse files Browse the repository at this point in the history
…mentals support
  • Loading branch information
oleg-nenashev committed Jun 19, 2018
1 parent a17e5cb commit a52eb36
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
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 "$@"

0 comments on commit a52eb36

Please sign in to comment.