diff --git a/Dockerfile b/Dockerfile index c09dcecc9924997c60aa6246399d09cc94c61244..98b5e19b28b19c4c3d42467c2401c271d7fd8ace 100644 --- a/Dockerfile +++ b/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} diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 823457aea18246249dc65732f7518459e5bb0835..24d3f0e6fdc31f34d722b259288812798320c9de 100644 --- a/hardening_manifest.yaml +++ b/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 diff --git a/renovate.json b/renovate.json index 87168a5e19b3bc5ceba74635f84d1d074191cf19..9e1c5aab9c37e2f0add1e5772df9a60d0f7a54ca 100644 --- a/renovate.json +++ b/renovate.json @@ -5,17 +5,9 @@ "baseBranches": [ "development" ], + "automerge": true, + "gitLabAutomerge": true, "regexManagers": [ - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "jenkins/jenkins", - "datasourceTemplate": "docker" - }, { "fileMatch": [ "^hardening_manifest.yaml$" @@ -37,4 +29,4 @@ "datasourceTemplate": "docker" } ] -} \ No newline at end of file +}