Merge branch 'development' into 'master'

master: bump ubi See merge request !32

Merge branch 'development' into 'master'
master: bump ubi See merge request !32
9c6f18a1 · Andy Maksymowicz · 90b712f3 · d1ef2564 · 9c6f18a1 · 9c6f18a1
Commit 9c6f18a1 authored May 21, 2021 by Andy Maksymowicz
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 13 deletions

Dockerfile Dockerfile +1 -1

hardening_manifest.yaml hardening_manifest.yaml +1 -1

renovate.json renovate.json +3 -11

No files found.
--- a/Dockerfile
+++ b/Dockerfile
 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
-ARG BASE_TAG=8.3
+ARG BASE_TAG=8.4

 # Updated by Renovate
 ARG version="1.7.8"

--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -13,7 +13,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:

--- a/renovate.json
+++ b/renovate.json
@@ -19,17 +19,9 @@
      }
    }
  ],
+  "automerge": true,
+  "gitLabAutomerge": true,
  "regexManagers": [
-    {
-      "fileMatch": [
-        "^Dockerfile$"
-      ],
-      "matchStrings": [
-        "version=\"(?<currentValue>.*?)\""
-      ],
-      "depNameTemplate": "istio/proxyv2",
-      "datasourceTemplate": "docker"
-    },
    {
      "fileMatch": [
        "^hardening_manifest.yaml$"
@@ -51,4 +43,4 @@
      "datasourceTemplate": "docker"
    }
  ]
-}
\ No newline at end of file
+}