Merge branch 'development' into 'master'

Development

See merge request !43

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.277.4-centos as jenkins
+FROM jenkins/jenkins:2.289.1-centos as jenkins
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 

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.277.4"
+- "2.289.1"
 - "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.277.4"
+  org.opencontainers.image.version: "2.289.1"
   ## 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:41f96d41b5165da3cae63f966f5531e643634fb86810c5faaddde4b23023196d"
-  tag: "jenkins/jenkins:2.277.4-centos"
+- url: "docker://docker.io/jenkins/jenkins@sha256:f76007845282ca3c6b664695bd88d12e713427adb5196dc0a205ffc70c9c07be"
+  tag: "jenkins/jenkins:2.289.1-centos"
 
 # List of project maintainers
 # FIXME: Fill in the following details for the current container owner in the whitelist

renovate.json

@@ -5,17 +5,9 @@
   "baseBranches": [
     "development"
   ],
+  "automerge": true,
+  "gitLabAutomerge": true,
   "regexManagers": [
-    {
-      "fileMatch": [
-        "^Dockerfile$"
-      ],
-      "matchStrings": [
-        "version=\"(?<currentValue>.*?)\""
-      ],
-      "depNameTemplate": "jenkins/jenkins",
-      "datasourceTemplate": "docker"
-    },
     {
       "fileMatch": [
         "^hardening_manifest.yaml$"
@@ -37,4 +29,4 @@
       "datasourceTemplate": "docker"
     }
   ]
-}
+}
\ No newline at end of file