Update configuration files in containers-common
Update configuration files in containers-storage
This commit is contained in:
Daniel J Walsh
parent
adb24c13f8
commit
fc46d756da
@ -33,23 +33,21 @@ The `storage` table supports the following options:
|
||||
**graphroot**=""
|
||||
container storage graph dir (default: "/var/lib/containers/storage")
|
||||
Default directory to store all writable content created by container storage programs.
|
||||
The rootless graphroot path supports environment variable substitutions (ie. `$HOME/containers/storage`)
|
||||
|
||||
**rootless_storage_path**="$HOME/.local/share/containers/storage"
|
||||
Storage path for rootless users. By default the graphroot for rootless users
|
||||
is set to `$XDG_DATA_HOME/containers/storage`, if XDG_DATA_HOME is set.
|
||||
Otherwise `$HOME/.local/share/containers/storage` is used. This field can
|
||||
be used if administrators need to change the storage location for all users.
|
||||
|
||||
The rootless storage path supports three substations:
|
||||
* `$HOME` => Replaced by the users home directory.
|
||||
* `$UID` => Replaced by the users UID
|
||||
* `$USER` => Replaced by the users name
|
||||
The rootless storage path supports environment variable substitutions (ie. `$HOME/containers/storage`)
|
||||
|
||||
A common use case for this field is to provide a local storage directory when user home directories are NFS-mounted (podman does not support container storage over NFS).
|
||||
|
||||
**runroot**=""
|
||||
container storage run dir (default: "/var/run/containers/storage")
|
||||
Default directory to store all temporary writable content created by container storage programs.
|
||||
The rootless runroot path supports environment variable substitutions (ie. `$HOME/containers/storage`)
|
||||
|
||||
### STORAGE OPTIONS TABLE
|
||||
|
||||
|
||||
@ -92,7 +92,7 @@
|
||||
# Ulimits has limits for non privileged container engines.
|
||||
#
|
||||
# default_ulimits = [
|
||||
# "nofile"="1280:2560",
|
||||
# "nofile=1280:2560",
|
||||
# ]
|
||||
|
||||
# List of default DNS options to be added to /etc/resolv.conf inside of the container.
|
||||
@ -116,6 +116,7 @@
|
||||
#
|
||||
# env = [
|
||||
# "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
|
||||
# "TERM=xterm",
|
||||
# ]
|
||||
|
||||
# Pass all host environment variables into the container.
|
||||
@ -322,6 +323,12 @@
|
||||
#
|
||||
# lock_type** = "shm"
|
||||
|
||||
# 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.
|
||||
#
|
||||
# multi_image_archive = "false"
|
||||
|
||||
# Default engine namespace
|
||||
# If engine is joined to a namespace, it will see only containers and pods
|
||||
# that were created in the same namespace, and will create new containers and
|
||||
@ -331,7 +338,7 @@
|
||||
#
|
||||
# namespace = ""
|
||||
|
||||
# NetworkCmdPath is the path to the slirp4netns binary
|
||||
# Path to the slirp4netns binary
|
||||
#
|
||||
# network_cmd_path=""
|
||||
|
||||
|
||||
@ -47,26 +47,31 @@ The containers table contains settings pertaining to the OCI runtime that can
|
||||
configure and manage the OCI runtime.
|
||||
|
||||
**devices**=[]
|
||||
|
||||
List of devices.
|
||||
Specified as 'device-on-host:device-on-container:permissions',
|
||||
for example: "/dev/sdc:/dev/xvdc:rwm".
|
||||
Specified as 'device-on-host:device-on-container:permissions'.
|
||||
Example: "/dev/sdc:/dev/xvdc:rwm".
|
||||
|
||||
**volumes**=[]
|
||||
|
||||
List of volumes.
|
||||
Specified as "directory-on-host:directory-in-container:options",
|
||||
for example: "/db:/var/lib/db:ro".
|
||||
Specified as "directory-on-host:directory-in-container:options".
|
||||
Example: "/db:/var/lib/db:ro".
|
||||
|
||||
**apparmor_profile**="container-default"
|
||||
|
||||
Used to change the name of the default AppArmor profile of container engines.
|
||||
The default profile name is "container-default".
|
||||
|
||||
**cgroupns**="private"
|
||||
|
||||
Default way to to create a cgroup namespace for the container.
|
||||
Options are:
|
||||
`private` Create private Cgroup Namespace for the container.
|
||||
`host` Share host Cgroup Namespace with the container.
|
||||
|
||||
**cgroups**="enabled"
|
||||
|
||||
Determines whether the container will create CGroups.
|
||||
Options are:
|
||||
`enabled` Enable cgroup support within container
|
||||
@ -74,6 +79,7 @@ The default profile name is "container-default".
|
||||
`no-conmon` Container engine runs run without conmon
|
||||
|
||||
**default_capabilities**=[]
|
||||
|
||||
List of default capabilities for containers.
|
||||
|
||||
The default list is:
|
||||
@ -96,36 +102,44 @@ The default profile name is "container-default".
|
||||
```
|
||||
|
||||
**default_sysctls**=[]
|
||||
|
||||
A list of sysctls to be set in containers by default,
|
||||
specified as "name=value",
|
||||
for example:"net.ipv4.ping_group_range=0 1000".
|
||||
specified as "name=value".
|
||||
Example:"net.ipv4.ping_group_range=0 1000".
|
||||
|
||||
**default_ulimits**=[]
|
||||
|
||||
A list of ulimits to be set in containers by default,
|
||||
specified as "name=soft-limit:hard-limit",
|
||||
for example:"nofile=1024:2048".
|
||||
specified as "name=soft-limit:hard-limit".
|
||||
Example: "nofile=1024:2048".
|
||||
|
||||
**dns_options**=[]
|
||||
|
||||
List of default DNS options to be added to /etc/resolv.conf inside of the
|
||||
container.
|
||||
|
||||
**dns_searches**=[]
|
||||
|
||||
List of default DNS search domains to be added to /etc/resolv.conf inside of
|
||||
the container.
|
||||
|
||||
**dns_servers**=[]
|
||||
|
||||
A list of dns servers to override the DNS configuration passed to the
|
||||
container. The special value “none” can be specified to disable creation of
|
||||
/etc/resolv.conf in the container.
|
||||
|
||||
**env**=["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"]
|
||||
**env**=["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "TERM=xterm"]
|
||||
|
||||
Environment variable list for the container process, used for passing
|
||||
environment variables to the container.
|
||||
|
||||
**env_host**=false
|
||||
|
||||
Pass all host environment variables into the container.
|
||||
|
||||
**http_proxy**=false
|
||||
|
||||
Default proxy environment variables will be passed into the container.
|
||||
The environment variables passed in include:
|
||||
`http_proxy`, `https_proxy`, `ftp_proxy`, `no_proxy`, and the upper case
|
||||
@ -134,32 +148,39 @@ but container should not use proxy. Proxy environment variables specified for
|
||||
the container in any other way will override the values passed from the host.
|
||||
|
||||
**init**=false
|
||||
|
||||
Run an init inside the container that forwards signals and reaps processes.
|
||||
|
||||
**init_path**="/usr/libexec/podman/catatonit"
|
||||
|
||||
Path to the container-init binary, which forwards signals and reaps processes
|
||||
within containers. Note that the container-init binary will only be used when
|
||||
the `--init` for podman-create and podman-run is set.
|
||||
|
||||
**ipcns**="private"
|
||||
|
||||
Default way to to create a IPC namespace for the container.
|
||||
Options are:
|
||||
`private` Create private IPC Namespace for the container.
|
||||
`host` Share host IPC Namespace with the container.
|
||||
|
||||
**label**=true
|
||||
|
||||
Indicates whether the container engines use MAC(SELinux) container separation via via labeling. Flag is ignored on disabled systems.
|
||||
|
||||
**log_driver**="k8s-file"
|
||||
|
||||
Logging driver for the container. Available options: `k8s-file` and `journald`.
|
||||
|
||||
**log_size_max**=-1
|
||||
|
||||
Maximum size allowed for the container's log file. Negative numbers indicate
|
||||
that no size limit is imposed. If it is positive, it must be >= 8192 to
|
||||
match/exceed conmon's read buffer. The file is truncated and re-opened so the
|
||||
limit is never exceeded.
|
||||
|
||||
**netns**="private"
|
||||
|
||||
Default way to to create a NET namespace for the container.
|
||||
Options are:
|
||||
`private` Create private NET Namespace for the container.
|
||||
@ -167,24 +188,29 @@ limit is never exceeded.
|
||||
`none` Containers do not use the network.
|
||||
|
||||
**no_hosts**=false
|
||||
|
||||
Create /etc/hosts for the container. By default, container engines manage
|
||||
/etc/hosts, automatically adding the container's own IP address.
|
||||
|
||||
**pids_limit**=1024
|
||||
|
||||
Maximum number of processes allowed in a container. 0 indicates that no limit
|
||||
is imposed.
|
||||
|
||||
**pidns**="private"
|
||||
|
||||
Default way to to create a PID namespace for the container.
|
||||
Options are:
|
||||
`private` Create private PID Namespace for the container.
|
||||
`host` Share host PID Namespace with the container.
|
||||
|
||||
**seccomp_profile**="/usr/share/containers/seccomp.json"
|
||||
|
||||
Path to the seccomp.json profile which is used as the default seccomp profile
|
||||
for the runtime.
|
||||
|
||||
**shm_size**="65536k"
|
||||
|
||||
Size of `/dev/shm`. The format is `<number><unit>`. `number` must be greater
|
||||
than `0`.
|
||||
Unit is optional and can be:
|
||||
@ -193,6 +219,7 @@ If you omit the unit, the system uses bytes. If you omit the size entirely,
|
||||
the system uses `65536k`.
|
||||
|
||||
**tz=**""
|
||||
|
||||
Set timezone in container. Takes IANA timezones as well as `local`, which sets the timezone in the container to match the host machine.
|
||||
If not set, then containers will run with the time zone specified in the image.
|
||||
Examples:
|
||||
@ -200,21 +227,25 @@ the system uses `65536k`.
|
||||
`tz="America/New_York"`
|
||||
|
||||
**umask**="0022"
|
||||
|
||||
Sets umask inside the container.
|
||||
|
||||
**utsns**="private"
|
||||
|
||||
Default way to to create a UTS namespace for the container.
|
||||
Options are:
|
||||
`private` Create private UTS Namespace for the container.
|
||||
`host` Share host UTS Namespace with the container.
|
||||
|
||||
**userns**="host"
|
||||
|
||||
Default way to to create a USER namespace for the container.
|
||||
Options are:
|
||||
`private` Create private USER Namespace for the container.
|
||||
`host` Share host USER Namespace with the container.
|
||||
|
||||
**userns_size**=65536
|
||||
|
||||
Number of UIDs to allocate for the automatic container creation. UIDs are
|
||||
allocated from the “container” UIDs listed in /etc/subuid & /etc/subgid.
|
||||
|
||||
@ -223,28 +254,35 @@ The `network` table contains settings pertaining to the management of CNI
|
||||
plugins.
|
||||
|
||||
**cni_plugin_dirs**=["/opt/cni/bin/",]
|
||||
|
||||
List of paths to directories where CNI plugin binaries are located.
|
||||
|
||||
**default_network**="podman"
|
||||
|
||||
The network name of the default CNI network to attach pods to.
|
||||
|
||||
**network_config_dir**="/etc/cni/net.d/"
|
||||
|
||||
Path to the directory where CNI configuration files are located.
|
||||
|
||||
## ENGINE TABLE
|
||||
The `engine` table contains configuration options used to set up container engines such as Podman and Buildah.
|
||||
|
||||
**cgroup_check**=false
|
||||
|
||||
CgroupCheck indicates the configuration has been rewritten after an upgrade to Fedora 31 to change the default OCI runtime for cgroupsv2.
|
||||
|
||||
**cgroup_manager**="systemd"
|
||||
|
||||
The cgroup management implementation used for the runtime. Supports `cgroupfs`
|
||||
and `systemd`.
|
||||
|
||||
**conmon_env_vars**=[]
|
||||
|
||||
Environment variables to pass into Conmon.
|
||||
|
||||
**conmon_path**=[]
|
||||
|
||||
Paths to search for the conmon container manager binary. If the paths are
|
||||
empty or no valid path was found, then the `$PATH` environment variable will be
|
||||
used as the fallback.
|
||||
@ -264,6 +302,7 @@ conmon_path=[
|
||||
```
|
||||
|
||||
**detach_keys**="ctrl-p,ctrl-q"
|
||||
|
||||
Keys sequence used for detaching a container.
|
||||
Specify the keys sequence used to detach a container.
|
||||
Format is a single character `[a-Z]` or a comma separated sequence of
|
||||
@ -271,6 +310,7 @@ Format is a single character `[a-Z]` or a comma separated sequence of
|
||||
`a-z`, `@`, `^`, `[`, `\`, `]`, `^` or `_`
|
||||
|
||||
**enable_port_reservation**=true
|
||||
|
||||
Determines whether the engine will reserve ports on the host when they are
|
||||
forwarded to containers. When enabled, when ports are forwarded to containers,
|
||||
they are held open by conmon as long as the container is running, ensuring that
|
||||
@ -279,37 +319,49 @@ significant memory usage if a container has many ports forwarded to it.
|
||||
Disabling this can save memory.
|
||||
|
||||
**env**=[]
|
||||
|
||||
Environment variables to be used when running the container engine (e.g., Podman, Buildah). For example "http_proxy=internal.proxy.company.com".
|
||||
Note these environment variables will not be used within the container. Set the env section under [containers] table,
|
||||
if you want to set environment variables for the container.
|
||||
|
||||
**events_logger**="journald"
|
||||
|
||||
Default method to use when logging events.
|
||||
Valid values: `file`, `journald`, and `none`.
|
||||
|
||||
**hooks_dir**=["/etc/containers/oci/hooks.d", ...]
|
||||
|
||||
Path to the OCI hooks directories for automatically executed hooks.
|
||||
|
||||
**image_default_transport**="docker://"
|
||||
|
||||
Default transport method for pulling and pushing images.
|
||||
|
||||
**infra_command**="/pause"
|
||||
|
||||
Command to run the infra container.
|
||||
|
||||
**infra_image**="k8s.gcr.io/pause:3.2"
|
||||
|
||||
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,
|
||||
reserving the pods resources for the lifetime of the pod.
|
||||
|
||||
**lock_type**="shm"
|
||||
|
||||
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
|
||||
"file" is useful only on platforms where cgo is not available for using the
|
||||
faster "shm" lock type. You may need to run "podman system renumber" after you
|
||||
change the lock type.
|
||||
|
||||
**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.
|
||||
|
||||
**namespace**=""
|
||||
|
||||
Default engine namespace. If the engine is joined to a namespace, it will see
|
||||
only containers and pods that were created in the same namespace, and will
|
||||
create new containers and pods in that namespace. The default namespace is "",
|
||||
@ -317,18 +369,22 @@ create new containers and pods in that namespace. The default namespace is "",
|
||||
and pods are visible.
|
||||
|
||||
**network_cmd_path**=""
|
||||
NetworkCmdPath is the path to the slirp4netns binary.
|
||||
|
||||
Path to the slirp4netns binary.
|
||||
|
||||
**no_pivot_root**=false
|
||||
|
||||
Whether to use chroot instead of pivot_root in the runtime.
|
||||
|
||||
**num_locks**=2048
|
||||
|
||||
Number of locks available for containers and pods. Each created container or
|
||||
pod consumes one lock. The default number available is 2048. If this is
|
||||
changed, a lock renumbering must be performed, using the
|
||||
`podman system renumber` command.
|
||||
|
||||
**active_service**=""
|
||||
|
||||
Name of destination for accessing the Podman service.
|
||||
|
||||
**[service_destinations]**
|
||||
@ -344,9 +400,11 @@ changed, a lock renumbering must be performed, using the
|
||||
- **rootfull remote** - ssh://root@10.10.1.136:22/run/podman/podman.sock
|
||||
|
||||
**identity="~/.ssh/id_rsa**
|
||||
|
||||
Path to file containing ssh identity key
|
||||
|
||||
**pull_policy**="always"|"missing"|"never"
|
||||
|
||||
Pull image before running or creating a container. The default is **missing**.
|
||||
|
||||
- **missing**: attempt to pull the latest image from the registries listed in registries.conf if a local image does not exist. Raise an error if the image is not in any listed registry and is not present locally.
|
||||
@ -354,31 +412,39 @@ Pull image before running or creating a container. The default is **missing**.
|
||||
- **never**: do not pull the image from the registry, use only the local version. Raise an error if the image is not present locally.
|
||||
|
||||
**runtime**="crun"
|
||||
|
||||
Default OCI specific runtime in runtimes that will be used by default. Must
|
||||
refer to a member of the runtimes table.
|
||||
|
||||
**runtime_supports_json**=["crun", "runc", "kata"]
|
||||
|
||||
The list of the OCI runtimes that support `--format=json`.
|
||||
|
||||
**runtime_supports_nocgroups**=["crun"]
|
||||
|
||||
The list of OCI runtimes that support running containers without CGroups.
|
||||
|
||||
**runtime_supports_kvm**=["kata"]
|
||||
|
||||
The list of OCI runtimes that support running containers with KVM separation.
|
||||
|
||||
**static_dir**="/var/lib/containers/storage/libpod"
|
||||
|
||||
Directory for persistent libpod files (database, etc).
|
||||
By default this will be configured relative to where containers/storage
|
||||
stores containers.
|
||||
|
||||
**stop_timeout**=10
|
||||
|
||||
Number of seconds to wait for container to exit before sending kill signal.
|
||||
|
||||
**tmp_dir**="/var/run/libpod"
|
||||
|
||||
The path to a temporary directory to store per-boot container.
|
||||
Must be a tmpfs (wiped after reboot).
|
||||
|
||||
**volume_path**="/var/lib/containers/storage/volumes"
|
||||
|
||||
Directory where named volumes will be created in using the default volume
|
||||
driver.
|
||||
By default this will be configured relative to where containers/storage store
|
||||
@ -386,6 +452,9 @@ containers. This convention is followed by the default volume driver, but may
|
||||
not be by other drivers.
|
||||
|
||||
# FILES
|
||||
|
||||
**containers.conf**
|
||||
|
||||
Distributions often provide a `/usr/share/containers/containers.conf` file to
|
||||
define default container configuration. Administrators can override fields in
|
||||
this file by creating `/etc/containers/containers.conf` to specify their own
|
||||
@ -399,6 +468,16 @@ this path will be used. This is primarily used for testing.
|
||||
Fields specified in the containers.conf file override the default options, as
|
||||
well as options in previously read containers.conf files.
|
||||
|
||||
**storage.conf**
|
||||
|
||||
The `/etc/containers/storage.conf` file is the default storage configuration file.
|
||||
Rootless users can override fields in the storage config by creating
|
||||
`$HOME/.config/containers/storage.conf`.
|
||||
|
||||
If the `CONTAINERS_STORAGE_CONF` path environment variable is set, this path
|
||||
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)
|
||||
|
||||
|
||||
@ -46,7 +46,7 @@ Epoch: 1
|
||||
Epoch: 2
|
||||
%endif
|
||||
Version: 1.1.1
|
||||
Release: 33.dev.git%{shortcommit0}%{?dist}
|
||||
Release: 34.dev.git%{shortcommit0}%{?dist}
|
||||
Summary: Inspect container images and repositories on registries
|
||||
License: ASL 2.0
|
||||
URL: %{git0}
|
||||
@ -439,6 +439,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
|
||||
%{_datadir}/%{name}/test
|
||||
|
||||
%changelog
|
||||
* Wed Aug 19 2020 Dan Walsh <dwalsh@fedoraproject.org> - 1:1.1.1-34.dev.git5d5756c
|
||||
- Update configuration files in containers-common
|
||||
- Update configuration files in containers-storage
|
||||
|
||||
* Wed Aug 19 13:10:49 GMT 2020 RH Container Bot <rhcontainerbot@fedoraproject.org> - 1:1.1.1-33.dev.git5d5756c
|
||||
- autobuilt 5d5756c
|
||||
|
||||
|
||||
@ -132,6 +132,10 @@ mountopt = "nodev,metacopy=on"
|
||||
# device.
|
||||
# mkfsarg = ""
|
||||
|
||||
# metadata_size is used to set the `pvcreate --metadatasize` options when
|
||||
# creating thin devices. Default is 128k
|
||||
# metadata_size = ""
|
||||
|
||||
# Size is used to set a maximum size of the container image.
|
||||
# size = ""
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user