Bump plugin versions
Add .jpi files for upgrading offline deployment
PROD-36850
PROD-36733
Change-Id: I1b0f5014279201b90142acf1537277e46449710b
diff --git a/Dockerfile b/Dockerfile
index 2d25a06..3cda148 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
FROM ubuntu:20.04
LABEL maintainer="dev@mirantis.com"
-LABEL build_date="2022-02-03"
+LABEL build_date="2022-04-12"
ENV DEBIAN_FRONTEND=noninteractive \
DEBCONF_NONINTERACTIVE_SEEN=true \
@@ -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
+RUN apt-get update && apt-get -yy upgrade && apt-get install -y git curl gettext-base python3-virtualenv openjdk-8-jdk unzip wget
ENV JENKINS_HOME /var/jenkins_home
ENV JENKINS_SLAVE_AGENT_PORT 50000
@@ -82,6 +82,7 @@
COPY jenkins-support /usr/local/bin/jenkins-support
COPY jenkins.sh /usr/local/bin/jenkins.sh
+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
@@ -89,62 +90,16 @@
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.10.6 \
- audit-trail:3.8 \
- blueocean:1.9.0 \
- 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 \
- description-setter:1.10 \
- discard-old-build:1.05 \
- docker-workflow:1.17 \
- email-ext:2.82 \
- envinject:2.3.0 \
- extended-choice-parameter:0.76 \
- extensible-choice-parameter:1.6.0 \
- gerrit-trigger:2.33.0 \
- git:4.6.0 \
- github:1.29.3 \
- heavy-job:1.1 \
- jdk-tool:1.1 \
- jobConfigHistory:2.18.2 \
- jira:3.0.3 \
- ldap:1.20 \
- lockable-resources:2.10 \
- 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.29 \
- simple-theme-plugin:0.5.1 \
- slack:2.47 \
- ssh-agent:1.17 \
- ssh-slaves:1.29.4 \
- test-stability:2.3 \
- throttle-concurrents:2.0.1 \
- workflow-cps:2.58 \
- workflow-remote-loader:1.5 \
- workflow-scm-step:2.7
-
-# Switch user for cleanup
USER root
+RUN mkdir -p /opt/plugins_files_offline \
+ && wget -P /opt/plugins_files_offline -i /opt/plugins_for_offline.txt \
+ && pushd /opt/plugins_files_offline && for f in *.hpi; do mv -- "$f" "${f%.hpi}.jpi" ; done && popd \
+ && chown -R ${user} /opt/plugins_files_offline
+
# Cleanup.
-RUN apt-get -y autoremove; apt-get -y clean;
-RUN rm -rf /root/.cache
-RUN rm -rf /var/lib/apt/lists/*
-RUN rm -rf /tmp/*
-RUN rm -rf /var/tmp/*
+RUN apt-get -y purge wget; apt-get -y autoremove; apt-get -y clean;
+RUN rm -rf /root/.cache /var/lib/apt/lists/* rm -rf /tmp/* rm -rf /var/tmp/*
# And switch it back
USER ${user}