Merge branch 'development' into 'master'

Development

See merge request !38

Dockerfile

@@ -2,7 +2,7 @@ ARG BASE_REGISTRY=registry1.dso.mil
 ARG BASE_IMAGE=redhat/openjdk/openjdk8-devel
 ARG BASE_TAG=1.8.0
 
-FROM jenkins/jenkins:2.263.2-centos as jenkins
+FROM jenkins/jenkins:2.277.3-centos as jenkins
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -33,7 +33,7 @@ RUN mkdir -p $JENKINS_HOME && \
     chown ${uid}:${gid} $JENKINS_HOME && \
     groupadd -g ${gid} ${group} && \
     useradd -d "$JENKINS_HOME" -u ${uid} -g ${gid} -m -s /bin/bash ${user} && \
-    dnf update -y && \
+    dnf update -y && dnf -y upgrade && \
     dnf install -y fontconfig git unzip --setopt=tsflags=nodocs && \
     git lfs install && \
     dnf clean all && \
@@ -72,4 +72,4 @@ 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
+COPY scripts/install-plugins.sh /usr/local/bin/install-plugins.sh
\ No newline at end of file

README.md

 # Official Jenkins Docker image
 
-# Approved for use behind a CNAP/CPN. It cannot be internet facing.
+# Approved for use behind a CNAP/VPN. It cannot be internet facing.
 
 [![Docker Stars](https://img.shields.io/docker/stars/jenkins/jenkins.svg)](https://hub.docker.com/r/jenkins/jenkins/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/jenkins/jenkins.svg)](https://hub.docker.com/r/jenkins/jenkins/)
@@ -299,4 +299,4 @@ If you wish to contribute fixes to this repository, please refer to the [dedicat
 
 Jump on irc.freenode.net and the #jenkins room. Ask!
 
-[system-property]: https://wiki.jenkins.io/display/JENKINS/Features+controlled+by+system+properties
+[system-property]: https://wiki.jenkins.io/display/JENKINS/Features+controlled+by+system+properties
\ No newline at end of file

hardening_manifest.yaml

@@ -8,7 +8,7 @@ name: "opensource/jenkins/jenkins"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "2.263.2"
+- "2.277.3"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -27,7 +27,7 @@ labels:
   org.opencontainers.image.url: "https://www.jenkins.io/"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "jenkins"
-  org.opencontainers.image.version: "2.263.2"
+  org.opencontainers.image.version: "2.277.3"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "cicd"
   ## This value can be "opensource" or "commercial"
@@ -37,8 +37,8 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-- url: "docker://docker.io/jenkins/jenkins@sha256:84897b3837cb90380da84bf1ac6758ad4babff0301d1fada8ea7a6d911cc68f3"
-  tag: "jenkins/jenkins:2.263.2-centos"
+- url: "docker://docker.io/jenkins/jenkins@sha256:11982a868f9e54f946e830d2327e4be58aadb9c35233461d98ed705dbe0d50af"
+  tag: "jenkins/jenkins:2.277.3-centos"
 
 # List of project maintainers
 # FIXME: Fill in the following details for the current container owner in the whitelist