diff --git a/Dockerfile b/Dockerfile index 43ec35b60d82ffb7935628eb669ebc77daeea037..f117caeeb0672a2ff29ae7c50e0282bdd92959b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG BASE_REGISTRY=registry1.dsop.io ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8 -ARG BASE_TAG=8.3 +ARG BASE_TAG=8.4 FROM istio/istioctl:1.7.8 AS base diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index de0222952f2887f976daeac676e0948cda82f1e7..019705c6cab11d6e0b00356a7946937a9b018b2a 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 0dc249f52dcc11efa444bc571256e3e697abfd9f..9e9e96912bbb91b473cf0d2d593cd76f7f6f4426 100644 --- a/renovate.json +++ b/renovate.json @@ -19,17 +19,9 @@ } } ], + "automerge": true, + "gitLabAutomerge": true, "regexManagers": [ - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "istio/istioctl", - "datasourceTemplate": "docker" - }, { "fileMatch": [ "^hardening_manifest.yaml$" @@ -51,4 +43,4 @@ "datasourceTemplate": "docker" } ] -} \ No newline at end of file +}