diff --git a/Dockerfile b/Dockerfile index d1925c1a6537866e95341c6678462685e7b24d55..611232b276cc8fa5041536e2e322022b6c58ed98 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_REGISTRY=registry1.dso.mil ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 -ARG BASE_TAG=8.3 +ARG BASE_TAG=8.4 FROM openpolicyagent/opa-telemetry:0.1.9 as base diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 718b89318ff7e9ffc8d352addf8b6f6faa2b3a98..e82ee4537268ece77e3e8ca4152b0ad62ad5d3f5 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 a174a10b187660f3d7de82e35eac077ab33d1517..7fba196e37921b30fb7d7928f33127766fd204a6 100644 --- a/renovate.json +++ b/renovate.json @@ -5,17 +5,9 @@ "baseBranches": [ "development" ], + "automerge": true, + "gitLabAutomerge": true, "regexManagers": [ - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "openpolicyagent/opa-telemetry", - "datasourceTemplate": "docker" - }, { "fileMatch": [ "^hardening_manifest.yaml$" @@ -37,4 +29,4 @@ "datasourceTemplate": "docker" } ] -} \ No newline at end of file +}