Skip to content

Commit

Permalink
Merge branch 'java10/2.128-incrementals' into java11-support
Browse files Browse the repository at this point in the history
# Conflicts:
#	Dockerfile
  • Loading branch information
oleg-nenashev committed Jun 19, 2018
2 parents bf49945 + a52eb36 commit f11f974
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 18 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/java11
# All documentation is applicable
FROM jenkins/jenkins-experimental:2.127-jdk11
FROM jenkins/jenkins-experimental:2.128-jdk11

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

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ THE SOFTWARE.
<staplerFork>true</staplerFork>
<stapler.version>1.254</stapler.version>
<spring.version>2.5.6.SEC03</spring.version>
<groovy.version>2.4.11</groovy.version>
<groovy.version>2.4.12</groovy.version>
</properties>

<dependencies>
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 f11f974

Please sign in to comment.