diff --git a/Dockerfile b/Dockerfile index cf3c0bea2b8b77bf33e4b4f93275aa3340f852a9..d2705372acee1bb3c5422688b103dc64f95ff496 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -ARG BASE_REGISTRY=registry1.dsop.io +ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 -ARG BASE_TAG=8.2 +ARG BASE_TAG=8.4 FROM quay.io/coreos/k8s-prometheus-adapter-amd64:v0.8.4 as base diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 741fc32b9c3bf58e995a2165caa7da4b451b5462..ba22447c57a8eaa08696ab46cfae02cedbecac9e 100644 --- a/hardening_manifest.yaml +++ b/hardening_manifest.yaml @@ -14,7 +14,7 @@ tags: # Build args passed to Dockerfile ARGs args: BASE_IMAGE: "redhat/ubi/ubi8" - BASE_TAG: "8.3" + BASE_TAG: "8.4" # Docker image labels labels: diff --git a/renovate.json b/renovate.json index 6e8cb80cfd041469183c7dbf0751ba4469562c9b..072a36c689895f422ea1be06e22273af2b5527b4 100644 --- a/renovate.json +++ b/renovate.json @@ -5,17 +5,9 @@ "baseBranches": [ "development" ], + "automerge": true, + "gitLabAutomerge": true, "regexManagers": [ - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "quay.io/coreos/k8s-prometheus-adapter-amd64", - "datasourceTemplate": "docker" - }, { "fileMatch": [ "^hardening_manifest.yaml$" @@ -37,4 +29,4 @@ "datasourceTemplate": "docker" } ] -} \ No newline at end of file +}