From 5ecb0d5b4b5d9973e93af24b74a56ef29a325e2e Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 19 2021 04:38:17 +0000 Subject: import containers-common-1-6.module+el8.6.0+12962+d1bf111c --- diff --git a/SOURCES/containers.conf b/SOURCES/containers.conf index 992e66f..91e266c 100644 --- a/SOURCES/containers.conf +++ b/SOURCES/containers.conf @@ -399,10 +399,6 @@ infra_image = "registry.access.redhat.com/ubi8/pause" # #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 # (e.g., of the docker-archive transport) with multiple images. By default, # Podman creates single-image archives. @@ -425,7 +421,7 @@ infra_image = "registry.access.redhat.com/ubi8/pause" # Default options to pass to the slirp4netns binary. # For example "allow_host_loopback=true" # -#network_cmd_options = ["enable_ipv6=true",] +#network_cmd_options = [] # Whether to use chroot instead of pivot_root in the runtime # @@ -455,25 +451,15 @@ runtime = "runc" # List of the OCI runtimes that support --format=json. When json is supported # engine will use it for reporting nicer errors. # -#runtime_supports_json = ["crun", "runc", "kata", "runsc", "krun"] +#runtime_supports_json = ["crun", "runc", "kata", "runsc"] # List of the OCI runtimes that supports running containers with KVM Separation. # -#runtime_supports_kvm = ["kata", "krun"] +#runtime_supports_kvm = ["kata"] # List of the OCI runtimes that supports running containers without cgroups. # -#runtime_supports_nocgroups = ["crun", "krun"] - -# Default location for storing temporary container image content. Can be overridden with the TMPDIR environment -# variable. If you specify "storage", then the location of the -# container/storage tmp directory will be used. -# image_copy_tmp_dir="/var/tmp" - -# Number of seconds to wait without a connection -# before the `podman system service` times out and exits -# -#service_timeout = 5 +#runtime_supports_nocgroups = ["crun"] # Directory for persistent engine files (database, etc) # By default, this will be configured relative to where the containers/storage @@ -512,7 +498,7 @@ runtime = "runc" # #volume_path = "/var/lib/containers/storage/volumes" -# Paths to look for a valid OCI runtime (crun, runc, kata, runsc, krun, etc) +# Paths to look for a valid OCI runtime (crun, runc, kata, runsc, etc) [engine.runtimes] #crun = [ # "/usr/bin/crun", @@ -555,16 +541,28 @@ runtime = "runc" # "/run/current-system/sw/bin/runsc", #] -#krun = [ -# "/usr/bin/krun", -# "/usr/local/bin/krun", -#] - [engine.volume_plugins] #testplugin = "/run/podman/plugins/test.sock" -# The [engine.volume_plugins] table MUST be the last entry in this file. +[machine] +# Number of CPU's a machine is created with. +# +#cpus=1 + +# The size of the disk in GB created when init-ing a podman-machine VM. +# +#disk_size=10 + +# The image used when creating a podman-machine VM. +# +#image = "testing" + +# Memory in MB a machine is created with. +# +#memory=2048 + +# The [machine] table MUST be the last entry in this file. # (Unless another table is added) # TOML does not provide a way to end a table other than a further table being -# defined, so every key hereafter will be part of [volume_plugins] and not the +# defined, so every key hereafter will be part of [machine] and not the # main config. diff --git a/SOURCES/containers.conf.5.md b/SOURCES/containers.conf.5.md index b7b606f..e58a099 100644 --- a/SOURCES/containers.conf.5.md +++ b/SOURCES/containers.conf.5.md @@ -446,11 +446,6 @@ Indicates if Podman is running inside a VM via Podman Machine. Podman uses this value to do extra setup around networking from the 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 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. @@ -467,23 +462,11 @@ and pods are visible. Path to the slirp4netns binary. -**network_cmd_options**=["enable_ipv6=true",] +**network_cmd_options**=[] Default options to pass to the slirp4netns binary. -Valid options values are: - - - **allow_host_loopback=true|false**: Allow the slirp4netns to reach the host loopback IP (`10.0.2.2`, which is added to `/etc/hosts` as `host.containers.internal` for your convenience). Default is false. - - **mtu=MTU**: Specify the MTU to use for this network. (Default is `65520`). - - **cidr=CIDR**: Specify ip range to use for this network. (Default is `10.0.2.0/24`). - - **enable_ipv6=true|false**: Enable IPv6. Default is false. (Required for `outbound_addr6`). - - **outbound_addr=INTERFACE**: Specify the outbound interface slirp should bind to (ipv4 traffic only). - - **outbound_addr=IPv4**: Specify the outbound ipv4 address slirp should bind to. - - **outbound_addr6=INTERFACE**: Specify the outbound interface slirp should bind to (ipv6 traffic only). - - **outbound_addr6=IPv6**: Specify the outbound ipv6 address slirp should bind to. - - **port_handler=rootlesskit**: Use rootlesskit for port forwarding. Default. - Note: Rootlesskit changes the source IP address of incoming packets to a IP address in the container network namespace, usually `10.0.2.100`. If your application requires the real source IP address, e.g. web server logs, use the slirp4netns port handler. The rootlesskit port handler is also used for rootless containers when connected to user-defined networks. - - **port_handler=slirp4netns**: Use the slirp4netns port forwarding, it is slower than rootlesskit but preserves the correct source IP address. This port handler cannot be used for user-defined networks. +Example "allow_host_loopback=true" **no_pivot_root**=false @@ -514,31 +497,18 @@ Default OCI specific runtime in runtimes that will be used by default. Must refer to a member of the runtimes table. Default runtime will be searched for on the system using the priority: "crun", "runc", "kata". -**runtime_supports_json**=["crun", "runc", "kata", "runsc", "krun"] +**runtime_supports_json**=["crun", "runc", "kata", "runsc"] The list of the OCI runtimes that support `--format=json`. -**runtime_supports_kvm**=["kata", "krun"] +**runtime_supports_kvm**=["kata"] The list of OCI runtimes that support running containers with KVM separation. -**runtime_supports_nocgroups**=["crun", "krun"] +**runtime_supports_nocgroups**=["crun"] The list of OCI runtimes that support running containers without CGroups. -**image_copy_tmp_dir**="/var/tmp" - -Default location for storing temporary container image content. Can be -overridden with the TMPDIR environment variable. If you specify "storage", then -the location of the container/storage tmp directory will be used. If set then it -is the users responsibility to cleanup storage. Configure tmpfiles.d(5) to -cleanup storage. - -**service_timeout**=**5** - -Number of seconds to wait without a connection before the -`podman system service` times out and exits - **static_dir**="/var/lib/containers/storage/libpod" Directory for persistent libpod files (database, etc). @@ -607,6 +577,25 @@ Currently valid values are: The driver specific options object. +## MACHINE TABLE +The `machine` table contains configurations for podman machine VMs + +**cpus**=1 +Number of CPU's a machine is created with. + +**disk_size**=10 + +The size of the disk in GB created when init-ing a podman-machine VM + +**image**="testing" + +Default image used when creating a new VM using `podman machine init`. +Options: `testing`, `stable`, `next`, or a custom path or download URL to an image + +**memory**=2048 + +Memory in MB a machine is created with. + # FILES **containers.conf** @@ -634,6 +623,6 @@ is used for the storage.conf file rather than the default. This is primarily used for testing. # SEE ALSO -containers-storage.conf(5), containers-policy.json(5), containers-registries.conf(5), tmpfiles.d(5) +containers-storage.conf(5), containers-policy.json(5), containers-registries.conf(5) [toml]: https://github.com/toml-lang/toml diff --git a/SPECS/containers-common.spec b/SPECS/containers-common.spec index 2d4eb79..04334ae 100644 --- a/SPECS/containers-common.spec +++ b/SPECS/containers-common.spec @@ -6,14 +6,14 @@ %global skopeo_branch main %global podman_branch main %global image_branch v5.16.0 -%global common_branch v0.45.0 +%global common_branch v0.44.2 %global storage_branch v1.36.0 %global shortnames_branch main Epoch: 2 Name: containers-common Version: 1 -Release: 4%{?dist} +Release: 6%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 BuildArch: noarch @@ -161,6 +161,14 @@ EOF %{_datadir}/rhel/secrets/* %changelog +* Wed Oct 13 2021 Jindrich Novy - 2:1-6 +- sync vendored components +- Related: #2001445 + +* Wed Sep 29 2021 Jindrich Novy - 2:1-5 +- update to the new vendored components +- Related: #2001445 + * Fri Sep 24 2021 Jindrich Novy - 2:1-4 - update to the new vendored components - Related: #2001445