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

containers-common-1-27.el8

Browse Source 
- do not specify infra_image in containers.conf
- needed to resolve gating test failures
- Related: #2000051

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2022-02-21 16:31:45 -05:00
parent eb66dbcf5c
commit 1e64308467
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
containers-common.spec
View File

@ -12,7 +12,7 @@
Epoch: 2 Epoch: 2
Name: containers-common Name: containers-common
Version: 1 Version: 1
Release: 26%{?dist} Release: 27%{?dist}
Summary: Common configuration and documentation for containers Summary: Common configuration and documentation for containers
License: ASL 2.0 License: ASL 2.0
BuildRequires: /usr/bin/go-md2man BuildRequires: /usr/bin/go-md2man
@ -79,7 +79,7 @@ separately.
%package -n aardvark-dns %package -n aardvark-dns
Version: 1.0.0 Version: 1.0.0
Release: 24%{?dist} Release: 27%{?dist}
URL: https://github.com/containers/aardvark-dns URL: https://github.com/containers/aardvark-dns
Summary: Authoritative DNS server for A/AAAA container records Summary: Authoritative DNS server for A/AAAA container records
License: ASL 2.0 and BSD and MIT License: ASL 2.0 and BSD and MIT
@ -98,7 +98,7 @@ Read more about configuration in `src/backend/mod.rs`.
%package -n netavark %package -n netavark
Version: 1.0.0 Version: 1.0.0
Release: 24%{?dist} Release: 27%{?dist}
URL: https://github.com/containers/netavark URL: https://github.com/containers/netavark
Summary: OCI network stack Summary: OCI network stack
License: ASL 2.0 and BSD and MIT License: ASL 2.0 and BSD and MIT
@ -258,6 +258,11 @@ EOF
%{_mandir}/man1/netavark.1* %{_mandir}/man1/netavark.1*
%changelog %changelog
* Mon Feb 21 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-27
- do not specify infra_image in containers.conf
- needed to resolve gating test failures
- Related: #2000051
* Sat Feb 19 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-26 * Sat Feb 19 2022 Lokesh Mandvekar <lsm5@redhat.com> - 2:1-26
- aardvark-dns built for same arches as netavark - aardvark-dns built for same arches as netavark
- Related: #2000051 - Related: #2000051

1
containers.conf
View File

@ -405,7 +405,6 @@ default_sysctls = [
# specify an image to pull. # specify an image to pull.
# #
#infra_image = "" #infra_image = ""
infra_image = "registry.access.redhat.com/ubi8/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

2
update.sh
View File

@ -27,7 +27,6 @@ if pwd | grep rhel-8 > /dev/null
then then
ensure registries.conf unqualified-search-registries [\"registry.fedoraproject.org\",\ \"registry.access.redhat.com\",\ \"registry.centos.org\",\ \"docker.io\"] 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 registries.conf short-name-mode \"permissive\"
ensure containers.conf infra_image \"registry.access.redhat.com/ubi8/pause\"
ensure containers.conf runtime \"runc\" ensure containers.conf runtime \"runc\"
ensure containers.conf events_logger \"file\" ensure containers.conf events_logger \"file\"
ensure containers.conf log_driver \"k8s-file\" ensure containers.conf log_driver \"k8s-file\"
@ -35,7 +34,6 @@ ensure containers.conf network_backend \"cni\"
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 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 \