diff --git a/Dockerfile.image-service b/Dockerfile.image-service index 2459774b..d09c16e3 100644 --- a/Dockerfile.image-service +++ b/Dockerfile.image-service @@ -70,8 +70,8 @@ RUN microdnf install -y dnf && microdnf clean all # Add CentOS Stream repositories for packages not available in UBI RUN dnf install -y 'dnf-command(config-manager)' && \ - dnf config-manager --add-repo http://mirror.stream.centos.org/9-stream/BaseOS/x86_64/os/ && \ - dnf config-manager --add-repo http://mirror.stream.centos.org/9-stream/AppStream/x86_64/os/ + dnf config-manager --add-repo https://mirror.stream.centos.org/9-stream/BaseOS/\$basearch/os/ && \ + dnf config-manager --add-repo https://mirror.stream.centos.org/9-stream/AppStream/\$basearch/os/ # Import CentOS GPG keys for secure package verification RUN rpm --import https://www.centos.org/keys/RPM-GPG-KEY-CentOS-Official diff --git a/renovate.json b/renovate.json index ec452998..a0ba6de4 100644 --- a/renovate.json +++ b/renovate.json @@ -52,6 +52,18 @@ ], "depNameTemplate": "registry.access.redhat.com/ubi8/go-toolset", "datasourceTemplate": "docker" + }, + { + "customType": "regex", + "managerFilePatterns": [ + "/^Dockerfile\\.image-service.*$/" + ], + "matchStrings": [ + "FROM registry.access.redhat.com/ubi9/ubi-minimal:(?[^@]+)@(?sha256:[a-f0-9]+)\\n", + "FROM --platform=\\$BUILDPLATFORM registry.access.redhat.com/ubi9/ubi-minimal:(?[^@]+)@(?sha256:[a-f0-9]+)\\n" + ], + "depNameTemplate": "registry.access.redhat.com/ubi9/ubi-minimal", + "datasourceTemplate": "docker" } ], "packageRules": [ @@ -117,6 +129,27 @@ "matchManagers": [ "tekton" ] + }, + { + "matchPackageNames": [ + "registry.access.redhat.com/ubi9/ubi-minimal" + ], + "groupName": "UBI Runtime Images", + "addLabels": [ + "ubi" + ] + }, + { + "matchUpdateTypes": [ + "major" + ], + "matchDatasources": [ + "docker" + ], + "matchPackageNames": [ + "registry.access.redhat.com/ubi9/ubi-minimal" + ], + "enabled": false } ] }