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

containers-common-1-19.el9 

- sync vendored components
- Related: #2000051

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2022-02-04 15:53:41 +01:00
parent 0657d23883
commit fa74eb3cc6
3 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
containers-common.spec
View File

@ -5,14 +5,14 @@
# podman/skopeo/podman. # podman/skopeo/podman.
%global skopeo_branch main %global skopeo_branch main
%global image_branch v5.19.0 %global image_branch v5.19.0
%global common_branch v0.47.1 %global common_branch v0.47.2
%global storage_branch v1.38.1 %global storage_branch v1.38.2
%global shortnames_branch main %global shortnames_branch main
Epoch: 2 Epoch: 2
Name: containers-common Name: containers-common
Version: 1 Version: 1
Release: 18%{?dist} Release: 19%{?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
@ -160,6 +160,10 @@ EOF
%{_datadir}/rhel/secrets/* %{_datadir}/rhel/secrets/*
%changelog %changelog
* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-19
- sync vendored components
- Related: #2000051
* Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-18 * Fri Feb 04 2022 Jindrich Novy <jnovy@redhat.com> - 2:1-18
- sync vendored components - sync vendored components
- Related: #2000051 - Related: #2000051

6
containers.conf
View File

@ -400,9 +400,11 @@ default_sysctls = [
# Infra (pause) container image name for pod infra containers. When running a # Infra (pause) container image name for pod infra containers. When running a
# pod, we start a `pause` process in a container to hold open the namespaces # pod, we start a `pause` process in a container to hold open the namespaces
# associated with the pod. This container does nothing other then sleep, # associated with the pod. This container does nothing other then sleep,
# reserving the pods resources for the lifetime of the pod. # reserving the pods resources for the lifetime of the pod. By default container
# engines run a builtin container using the pause executable. If you want override
# specify an image to pull.
# #
#infra_image = "k8s.gcr.io/pause:3.4.1" #infra_image = ""
infra_image = "registry.access.redhat.com/ubi8/pause" 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".

17
containers.conf.5.md
View File

@ -435,15 +435,20 @@ Not setting this field will fall back to containers/image defaults. (6)
**infra_command**="/pause" **infra_command**="/pause"
Command to run the infra container. Infra (pause) container image command for pod infra containers. When running a
pod, we start a `/pause` process in a container to hold open the namespaces
**infra_image**="k8s.gcr.io/pause:3.4.1"
Infra (pause) container image name for pod infra containers. When running a
pod, we start a `pause` process in a container to hold open the namespaces
associated with the pod. This container does nothing other then sleep, associated with the pod. This container does nothing other then sleep,
reserving the pods resources for the lifetime of the pod. reserving the pods resources for the lifetime of the pod.
**infra_image**=""
Infra (pause) container image for pod infra containers. When running a
pod, we start a `pause` process in a container to hold open the namespaces
associated with the pod. This container does nothing other then sleep,
reserving the pods resources for the lifetime of the pod. By default container
engines run a builtin container using the pause executable. If you want override
specify an image to pull.
**lock_type**="shm" **lock_type**="shm"
Specify the locking mechanism to use; valid values are "shm" and "file". Specify the locking mechanism to use; valid values are "shm" and "file".