containers-common-1-3.el9

- update to the new vendored components
- Related: #2000051

Signed-off-by: Jindrich Novy <jnovy@redhat.com>
This commit is contained in:
Jindrich Novy 2021-09-09 11:28:02 +02:00
parent 327084c75c
commit 1833a42dbe
5 changed files with 24 additions and 8 deletions

View File

@ -3,17 +3,17 @@
# These vendored components must have the same version. If it is not the case, # These vendored components must have the same version. If it is not the case,
# pick the oldest version on c/image, c/common, c/storage vendored in # pick the oldest version on c/image, c/common, c/storage vendored in
# podman/skopeo/podman. # podman/skopeo/podman.
%global skopeo_branch v1.4.0 %global skopeo_branch main
%global podman_branch v3.3-0-rc3 %global podman_branch main
%global image_branch v5.15.2 %global image_branch v5.16.0
%global common_branch v0.42.1 %global common_branch v0.43.2
%global storage_branch v1.34.1 %global storage_branch v1.35.0
%global shortnames_branch main %global shortnames_branch main
Epoch: 2 Epoch: 2
Name: containers-common Name: containers-common
Version: 1 Version: 1
Release: 2%{?dist} Release: 3%{?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
* Thu Sep 09 2021 Jindrich Novy <jnovy@redhat.com> - 2:1-3
- update to the new vendored components
- Related: #2000051
* Fri Aug 20 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1-2 * Fri Aug 20 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:1-2
- bump configs to latest versions - bump configs to latest versions
- replace ubi9 references with ubi8 - replace ubi9 references with ubi8

View File

@ -62,7 +62,7 @@ default_capabilities = [
# A list of sysctls to be set in containers by default, # A list of sysctls to be set in containers by default,
# specified as "name=value", # specified as "name=value",
# for example:"net.ipv4.ping_group_range = 0 0". # for example:"net.ipv4.ping_group_range=0 0".
# #
default_sysctls = [ default_sysctls = [
"net.ipv4.ping_group_range=0 0", "net.ipv4.ping_group_range=0 0",
@ -384,6 +384,10 @@ infra_image = "registry.access.redhat.com/ubi8/pause"
# #
#machine_enabled = false #machine_enabled = false
# The image used when creating a podman-machine VM.
#
#machine_image = "testing"
# MultiImageArchive - if true, the container engine allows for storing archives # MultiImageArchive - if true, the container engine allows for storing archives
# (e.g., of the docker-archive transport) with multiple images. By default, # (e.g., of the docker-archive transport) with multiple images. By default,
# Podman creates single-image archives. # Podman creates single-image archives.

View File

@ -412,6 +412,11 @@ Indicates if Podman is running inside a VM via Podman Machine.
Podman uses this value to do extra setup around networking from the Podman uses this value to do extra setup around networking from the
container inside the VM to to host. container inside the VM to to host.
**machine_image**="testing"
Default image used when creating a new VM using `podman machine init`.
Options: `testing`, `stable`, or a custom path or download URL to an image
**multi_image_archive**=false **multi_image_archive**=false
Allows for creating archives (e.g., tarballs) with more than one image. Some container engines, such as Podman, interpret additional arguments as tags for one image and hence do not store more than one image. The default behavior can be altered with this option. Allows for creating archives (e.g., tarballs) with more than one image. Some container engines, such as Podman, interpret additional arguments as tags for one image and hence do not store more than one image. The default behavior can be altered with this option.

View File

@ -242,6 +242,7 @@
"madvise", "madvise",
"mbind", "mbind",
"memfd_create", "memfd_create",
"memfd_secret",
"mincore", "mincore",
"mkdir", "mkdir",
"mkdirat", "mkdirat",

View File

@ -61,5 +61,7 @@
"busybox" = "docker.io/library/busybox" "busybox" = "docker.io/library/busybox"
# php # php
"php" = "docker.io/library/php" "php" = "docker.io/library/php"
#python # python
"python" = "docker.io/library/python" "python" = "docker.io/library/python"
# node
"node" = "docker.io/library/node"