Skip to content

Commit

Permalink
Bumping jenkins version to 2.303.3
Browse files Browse the repository at this point in the history
Removing check-for-existing-jenkinshome.sh now that jenkins helm chart does this for us
  • Loading branch information
missingcharacter committed Nov 5, 2021
1 parent 42e9cde commit b3b04f9
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 22 deletions.
15 changes: 1 addition & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/jenkins:2.303.2-jdk11
FROM jenkins/jenkins:2.303.3-jdk11

USER root

Expand All @@ -21,17 +21,4 @@ COPY jenkins-plugins.yaml /usr/share/jenkins/ref/plugins/
# Install plugins
RUN jenkins-plugin-cli -f /usr/share/jenkins/ref/plugins/jenkins-plugins.yaml

# check-for-existing-jenkinshome.sh is a tiny shell script that detects whether $JENKINS_HOME is an empty dir
# if so, it creates a stub file to prevent the initialAdminPassword bootstrap behavior of the vanilla jenkins image
# Read-only permissions are set on "${JENKINS_HOME}/plugins" because we do not want people to be able to install
# new plugins from the UI, new plugins and plugin updates should be installed/updated via the creation of a new
# container image
ADD check-for-existing-jenkinshome.sh /usr/local/bin/check-for-existing-jenkinshome.sh
RUN chmod -R 0400 "${JENKINS_HOME}/plugins"; \
mv /usr/local/bin/jenkins.sh /usr/local/bin/jenkins.sh.backup; \
cat /usr/local/bin/check-for-existing-jenkinshome.sh > /usr/local/bin/jenkins.sh; \
tail -n +2 /usr/local/bin/jenkins.sh.backup >> /usr/local/bin/jenkins.sh; \
chmod +x /usr/local/bin/jenkins.sh; \
rm -rf /var/jenkins_home/*

USER jenkins
8 changes: 0 additions & 8 deletions check-for-existing-jenkinshome.sh

This file was deleted.

0 comments on commit b3b04f9

Please sign in to comment.