Merge branch 'olga-update' into 'development'

Olga update

See merge request !47

Dockerfile

@@ -63,13 +63,15 @@ USER ${user}
 
 COPY --from=jenkins /usr/local/bin/jenkins-support /usr/local/bin/jenkins-support
 COPY scripts/jenkins.sh /usr/local/bin/jenkins.sh
+COPY jenkins-plugin-manager.jar /opt
 COPY --from=jenkins /bin/tini /bin/tini
 COPY --from=jenkins /sbin/tini /sbin/tini
+COPY scripts/plugins.sh /usr/local/bin/plugins.sh
+COPY scripts/install-plugins.sh /usr/local/bin/install-plugins.sh
+COPY scripts/jenkins-plugin-cli.sh /bin/jenkins-plugin-cli
 
 HEALTHCHECK --interval=10s --timeout=5s --start-period=1m --retries=5 CMD curl -I -f --max-time 5 http://localhost:8080/login?from=%2F || exit 1
 
 ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"]
 
 # from a derived Dockerfile, can use `RUN plugins.sh active.txt` to setup $REF/plugins from a support bundle
-COPY scripts/plugins.sh /usr/local/bin/plugins.sh
-COPY scripts/install-plugins.sh /usr/local/bin/install-plugins.sh

hardening_manifest.yaml

@@ -39,6 +39,11 @@ labels:
 resources:
 - url: "docker://docker.io/jenkins/jenkins@sha256:a9cf9e95587179d843e1e9817ac2c1246c44935d5b8222b3a742114ffd88fc9a"
   tag: "jenkins/jenkins:2.289.2-centos"
+- filename: jenkins-plugin-manager.jar
+  url: https://github.com/jenkinsci/plugin-installation-manager-tool/releases/download/2.10.0/jenkins-plugin-manager-2.10.0.jar
+  validation:
+    type: sha256
+    value: fd52046f8167355754471cf9d817986eb8b43f1832b7bac7c36eded65821f2c1
 
 # List of project maintainers
 # FIXME: Fill in the following details for the current container owner in the whitelist

scripts/jenkins-plugin-cli.sh

+#!/bin/bash
+
+exec /bin/bash -c "java $JAVA_OPTS -jar /opt/jenkins-plugin-manager.jar $*"
\ No newline at end of file