diff --git a/Dockerfile b/Dockerfile index c73463b84f779587768d66d8d3d92c4749b71e16..68dd36ba8a6a2c7fc9b4261a80026a23b567dd41 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 goharbor/notary-signer-photon:v2.2.1 as base diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 5659adb94d1e4e29148c9a3df16b51d184f21e6a..e7667deb1a7159b29c51f98a9ec5d13aa4b99607 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 ec4f46a6415f8ffff3a3a1c210e32f5502e8a0dc..f004124ed94f81344fe16c4907b8ab16b126933b 100644 --- a/renovate.json +++ b/renovate.json @@ -5,17 +5,9 @@ "baseBranches": [ "development" ], + "automerge": true, + "gitLabAutomerge": true, "regexManagers": [ - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "goharbor/notary-signer-photon", - "datasourceTemplate": "docker" - }, { "fileMatch": [ "^hardening_manifest.yaml$" @@ -37,4 +29,4 @@ "datasourceTemplate": "docker" } ] -} \ No newline at end of file +}