rpms/containers-common
7
0
Fork 0
Code Issues Pull Requests Releases Activity

containers-common-1-4.el9

Browse Source 
- fix updating scripts
- Related: #2000051

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2021-09-10 12:35:58 +02:00
parent 1833a42dbe
commit 456bc5ddac
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
containers-common.spec
View File

@ -13,7 +13,7 @@
Epoch: 2 Epoch: 2
Name: containers-common Name: containers-common
Version: 1 Version: 1
Release: 3%{?dist} Release: 4%{?dist}
Summary: Common configuration and documentation for containers Summary: Common configuration and documentation for containers
License: ASL 2.0 License: ASL 2.0
BuildArch: noarch BuildArch: noarch
@ -161,6 +161,10 @@ EOF
%{_datadir}/rhel/secrets/* %{_datadir}/rhel/secrets/*
%changelog %changelog
* Fri Sep 10 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-4
- fix updating scripts
- Related: #2000051
* Thu Sep 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-3 * Thu Sep 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-3
- update to the new vendored components - update to the new vendored components
- Related: #2000051 - Related: #2000051

2
containers.conf
View File

@ -368,7 +368,7 @@ events_logger = "file"
# reserving the pods resources for the lifetime of the pod. # reserving the pods resources for the lifetime of the pod.
# #
#infra_image = "k8s.gcr.io/pause:3.4.1" #infra_image = "k8s.gcr.io/pause:3.4.1"
infra_image = "registry.access.redhat.com/ubi8/pause" infra_image = "registry.access.redhat.com/ubi9/pause"
# Specify the locking mechanism to use; valid values are "shm" and "file". # Specify the locking mechanism to use; valid values are "shm" and "file".
# Change the default only if you are sure of what you are doing, in general # Change the default only if you are sure of what you are doing, in general

5
update-vendored.sh
View File

@ -8,14 +8,13 @@ pwd | grep /tmp/centos > /dev/null
if [ $? == 0 ]; then if [ $? == 0 ]; then
CENTOS=1 CENTOS=1
fi fi
set -xe set -e
echo $B
for P in podman skopeo buildah; do for P in podman skopeo buildah; do
BRN=`pwd | sed 's,^.*/,,'` BRN=`pwd | sed 's,^.*/,,'`
rm -rf $P rm -rf $P
pkg clone $P pkg clone $P
cd $P cd $P
[ ! -z "$CENTOS" ] && pkg switch-branch $B [ -z "$CENTOS" ] && pkg switch-branch $BRN
if [ $BRN != stream-container-tools-rhel8 ]; then if [ $BRN != stream-container-tools-rhel8 ]; then
pkg prep pkg prep
else else

2
update.sh
View File

@ -33,7 +33,7 @@ ensure containers.conf runtime \"runc\"
else 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 infra_image \"registry.access.redhat.com/ubi8/pause\" ensure containers.conf infra_image \"registry.access.redhat.com/ubi9/pause\"
ensure containers.conf runtime \"crun\" ensure containers.conf runtime \"crun\"
fi fi
[ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \ [ `grep "keyctl" seccomp.json | wc -l` == 0 ] && sed -i '/\"kill\",/i \