rpms/skopeo
7
0
Fork 0
Code Issues Pull Requests Releases Activity

skopeo-1.4.0-4.el9

Browse Source 
- put both RHEL8 and RHEL9 conditional configurations into update.sh
- Related: #1970747

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2021-08-04 17:08:43 +02:00
parent 1be0b913f3
commit ac6f2533d8
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
skopeo.spec
View File

@ -30,7 +30,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
Epoch: 1 Epoch: 1
Name: skopeo Name: skopeo
Version: 1.4.0 Version: 1.4.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: Inspect container images and repositories on registries Summary: Inspect container images and repositories on registries
License: ASL 2.0 License: ASL 2.0
URL: %{git0} URL: %{git0}
@ -267,6 +267,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_datadir}/%{name}/test %{_datadir}/%{name}/test
%changelog %changelog
* Wed Aug 04 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-4
- put both RHEL8 and RHEL9 conditional configurations into update.sh
- Related: #1970747
* Wed Aug 04 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-3 * Wed Aug 04 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.4.0-3
- update vendored components - update vendored components
- always require runc on RHEL8 or lesser - always require runc on RHEL8 or lesser

10
update.sh
View File

@ -23,11 +23,19 @@ $2 = $3" $1
spectool -f -g skopeo.spec spectool -f -g skopeo.spec
ensure storage.conf driver \"overlay\" ensure storage.conf driver \"overlay\"
ensure storage.conf mountopt \"nodev,metacopy=on\" 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 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 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 infra_image \"registry.access.redhat.com/ubi9/pause\"
ensure containers.conf runtime \"crun\" ensure containers.conf runtime \"crun\"
fi
[ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \ [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \
"keyctl",' seccomp.json "keyctl",' seccomp.json
sed -i '/\"socketcall\",/i \ sed -i '/\"socketcall\",/i \