From ac6f2533d8c18560c77777fa49474d45775958f2 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Wed, 4 Aug 2021 17:08:43 +0200 Subject: [PATCH] skopeo-1.4.0-4.el9 - put both RHEL8 and RHEL9 conditional configurations into update.sh - Related: #1970747 Signed-off-by: Jindrich Novy --- skopeo.spec | 6 +++++- update.sh | 10 +++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/skopeo.spec b/skopeo.spec index 97e074d..337334f 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: 3%{?dist} +Release: 4%{?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 +* Wed Aug 04 2021 Jindrich Novy - 1:1.4.0-4 +- put both RHEL8 and RHEL9 conditional configurations into update.sh +- Related: #1970747 + * Wed Aug 04 2021 Jindrich Novy - 1:1.4.0-3 - update vendored components - always require runc on RHEL8 or lesser diff --git a/update.sh b/update.sh index f033841..fb9c5d8 100755 --- a/update.sh +++ b/update.sh @@ -23,11 +23,19 @@ $2 = $3" $1 spectool -f -g skopeo.spec ensure storage.conf driver \"overlay\" ensure storage.conf mountopt \"nodev,metacopy=on\" +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 \"disabled\" +ensure containers.conf infra_image \"registry.access.redhat.com/ubi8/pause\" +ensure containers.conf runtime \"runc\" +else ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"quay.io\",\ \"docker.io\"] ensure registries.conf short-name-mode \"enforcing\" -ensure containers.conf events_logger \"file\" ensure containers.conf infra_image \"registry.access.redhat.com/ubi9/pause\" ensure containers.conf runtime \"crun\" +fi [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \ "keyctl",' seccomp.json sed -i '/\"socketcall\",/i \