Bump Jenkins to 2.414.2
PROD-37234
Change-Id: I912e7650ec489102a1d33e67e0e493e61161fd25
diff --git a/Dockerfile b/Dockerfile
index 9bb2b7c..26b2d02 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@
&& echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' > apt.conf.d/docker-gzip-indexes \
&& echo 'APT::Get::Install-Recommends "false"; APT::Get::Install-Suggests "false";' > apt.conf.d/docker-recommends
-RUN apt-get update && apt-get -yy upgrade && apt-get install -y git curl gettext-base python3-virtualenv openjdk-8-jdk unzip wget
+RUN apt-get update && apt-get -yy upgrade && apt-get install -y git curl gettext-base python3-virtualenv openjdk-11-jdk unzip wget
ENV JENKINS_HOME /var/jenkins_home
ENV JENKINS_SLAVE_AGENT_PORT 50000
@@ -51,10 +51,10 @@
# jenkins version being bundled in this docker image
ARG JENKINS_VERSION
-ENV JENKINS_VERSION ${JENKINS_VERSION:-2.263.4}
+ENV JENKINS_VERSION ${JENKINS_VERSION:-2.414.2}
# jenkins.war checksum, download will be validated using it
-ARG JENKINS_SHA=1d4a7409784236a84478b76f3f2139939c0d7a3b4b2e53b1fcef400c14903ab6
+ARG JENKINS_SHA=922bbf6269fddad614bb6540241ed0ce5523a4a5328229e15f5e7bb7ffd565b8
# Can be used to customize where jenkins.war get downloaded from
ARG JENKINS_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
@@ -85,61 +85,9 @@
COPY pre_startup_copy_plugins.sh /usr/local/bin/pre_startup_copy_plugins.sh
ENTRYPOINT ["/bin/tini", "--", "/usr/local/bin/jenkins.sh"]
-# from a derived Dockerfile, can use `RUN plugins.sh active.txt` to setup /usr/share/jenkins/ref/plugins from a support bundle
-COPY plugins.sh /usr/local/bin/plugins.sh
-COPY install-plugins.sh /usr/local/bin/install-plugins.sh
-COPY jenkins-plugins-deps /usr/share/jenkins/ref/jenkins-plugins-deps
COPY theme /usr/share/jenkins/ref/userContent/theme
COPY plugins_for_offline.txt /opt/
-# list of plugins which should be installed. Doesn't include deps list, which specified in jenkins-plugins-deps file.
-RUN JENKINS_UC_DOWNLOAD=http://archives.jenkins-ci.org /usr/local/bin/install-plugins.sh \
- antisamy-markup-formatter:1.5 \
- artifactory:3.15.4 \
- audit-trail:3.8 \
- blueocean:1.24.8 \
- build-blocker-plugin:1.7.3 \
- build-monitor-plugin:1.12+build.201809061734 \
- build-timeout:1.19 \
- build-user-vars-plugin:1.5 \
- categorized-view:1.10 \
- command-launcher:1.2 \
- copyartifact:1.46.2 \
- description-setter:1.10 \
- discard-old-build:1.05 \
- docker-workflow:1.17 \
- email-ext:2.84 \
- envinject:2.3.0 \
- extended-choice-parameter:0.76 \
- extensible-choice-parameter:1.6.0 \
- gerrit-trigger:2.35.2 \
- git:4.8.3 \
- github:1.34.2 \
- heavy-job:1.1 \
- jdk-tool:1.1 \
- jira:3.3 \
- jobConfigHistory:2.18.2 \
- ldap:1.20 \
- lockable-resources:2.14 \
- matrix-auth:2.6.6 \
- monitoring:1.87.0 \
- multiple-scms:0.6 \
- performance:3.12 \
- permissive-script-security:0.3 \
- pipeline-utility-steps:2.1.0 \
- plot:2.1.0 \
- prometheus:2.0.0 \
- rebuild:1.33 \
- simple-theme-plugin:0.5.1 \
- slack:2.49 \
- ssh-agent:1.17 \
- ssh-slaves:1.29.4 \
- test-stability:2.3 \
- throttle-concurrents:2.0.1 \
- workflow-cps:2659.v52d3de6044d0 \
- workflow-remote-loader:1.5 \
- workflow-scm-step:2.13
-
USER root
RUN mkdir -p /opt/plugins_files_offline \
&& wget -P /opt/plugins_files_offline -i /opt/plugins_for_offline.txt \