diff --git a/Dockerfile b/Dockerfile index e7c07b6e4935b146df725d721cc3ad0bc651c619..f8758243086ad946e499846fc02cdbfda57d13d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,11 @@ -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=latest FROM minio/mc:RELEASE.2021-05-18T03-39-44Z as base FROM $BASE_REGISTRY/$BASE_IMAGE:$BASE_TAG - RUN dnf update -y && \ dnf clean all && \ rm -rf /var/cache/dnf diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml index 0c73b73da415004e9a52202f2cf964e57d4e1e4c..f54588a42b49dcc617d04f198cdbc7e66a5fb6ee 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 3a15d0af8d8f2c880bb46fef1539dd7b58afd314..70ad577254a6005300e321c28b720dbc4bfd7091 100644 --- a/renovate.json +++ b/renovate.json @@ -19,17 +19,9 @@ } } ], + "automerge": true, + "gitLabAutomerge": true, "regexManagers": [ - { - "fileMatch": [ - "^Dockerfile$" - ], - "matchStrings": [ - "version=\"(?.*?)\"" - ], - "depNameTemplate": "minio/mc", - "datasourceTemplate": "docker" - }, { "fileMatch": [ "^hardening_manifest.yaml$" @@ -51,4 +43,4 @@ "datasourceTemplate": "docker" } ] -} \ No newline at end of file +}