From 9c8c573e75934f6a65267f4e89f67379837ddb35 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Fri, 6 Aug 2021 08:24:53 +0200 Subject: [PATCH] skopeo-1.4.0-6.el9 - be sure short-name-mode is permissive in RHEL8 - Related: #1970747 Signed-off-by: Jindrich Novy --- skopeo.spec | 6 +++++- update.sh | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/skopeo.spec b/skopeo.spec index 527b6ff..1d0b9f7 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -30,7 +30,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl Epoch: 1 Name: skopeo Version: 1.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -267,6 +267,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Fri Aug 06 2021 Jindrich Novy - 1:1.4.0-6 +- be sure short-name-mode is permissive in RHEL8 +- Related: #1970747 + * Wed Aug 04 2021 Jindrich Novy - 1:1.4.0-5 - don't define short-name-mode in RHEL8 - Related: #1970747 diff --git a/update.sh b/update.sh index de439ec..8c4ea1a 100755 --- a/update.sh +++ b/update.sh @@ -27,6 +27,7 @@ ensure containers.conf events_logger \"file\" if pwd | grep rhel-8 > /dev/null then ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"docker.io\"] +ensure registries.conf short-name-mode \"permissive\" ensure containers.conf infra_image \"registry.access.redhat.com/ubi8/pause\" ensure containers.conf runtime \"runc\" else