diff --git a/.gitignore b/.gitignore index f779712..d6abdc6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/v1.1.1.tar.gz +SOURCES/release-1.2-2b4097b.tar.gz diff --git a/.skopeo.metadata b/.skopeo.metadata index 389cd1b..9e4b852 100644 --- a/.skopeo.metadata +++ b/.skopeo.metadata @@ -1 +1 @@ -997b1d28c341f37e655d19534d29073aca424cd4 SOURCES/v1.1.1.tar.gz +61fb0362a46065dd096e03a13b9cc81d1ba469f6 SOURCES/release-1.2-2b4097b.tar.gz diff --git a/SOURCES/containers-registries.conf.d.5.md b/SOURCES/containers-registries.conf.d.5.md new file mode 100644 index 0000000..2d85e8b --- /dev/null +++ b/SOURCES/containers-registries.conf.d.5.md @@ -0,0 +1,37 @@ +% CONTAINERS-REGISTRIES.CONF.D(5) +% Valentin Rothberg +% Mar 2020 + +# NAME +containers-registries.conf.d - directory for drop-in registries.conf files + +# DESCRIPTION +CONTAINERS-REGISTRIES.CONF.D is a system-wide directory for drop-in +configuration files in the `containers-registries.conf(5)` format. + +By default, the directory is located at `/etc/containers/registries.conf.d`. + +# CONFIGURATION PRECEDENCE + +Once the main configuration at `/etc/containers/registries.conf` is loaded, the +files in `/etc/containers/registries.conf.d` are loaded in alpha-numerical +order. Then the conf files in `$HOME/.config/containers/registries.conf.d` are loaded in alpha-numerical order, if they exist. If the `$HOME/.config/containers/registries.conf` is loaded, only the conf files under `$HOME/.config/containers/registries.conf.d` are loaded in alpha-numerical order. +Specified fields in a conf file will overwrite any previous setting. Note +that only files with the `.conf` prefix are loaded, other files and +sub-directories are ignored. + +For instance, setting the `unqualified-search-registries` in +`/etc/containers/registries.conf.d/myregistries.conf` will overwrite previous +settings in `/etc/containers/registries.conf`. The `[[registry]]` tables merged +by overwriting existing items if the prefixes are identical while new ones are +added. + +All drop-in configuration files must be specified in the version 2 of the +`containers-registries.conf(5)` format. + +# SEE ALSO +`containers-registries.conf(5)` + +# HISTORY + +Mar 2020, Originally compiled by Valentin Rothberg diff --git a/SOURCES/containers-registries.d.5.md b/SOURCES/containers-registries.d.5.md index 263002b..892f617 100644 --- a/SOURCES/containers-registries.d.5.md +++ b/SOURCES/containers-registries.d.5.md @@ -12,7 +12,7 @@ The registries configuration directory contains configuration for various regist so that the configuration does not have to be provided in command-line options over and over for every command, and so that it can be shared by all users of containers/image. -By default (unless overridden at compile-time), the registries configuration directory is `/etc/containers/registries.d`; +By default, the registries configuration directory is `$HOME/.config/containers/registries.d` if it exists, otherwise `/etc/containers/registries.d` (unless overridden at compile-time); applications may allow using a different directory instead. ## Directory Structure diff --git a/SOURCES/containers-storage.conf.5.md b/SOURCES/containers-storage.conf.5.md index 5ea362f..b229583 100644 --- a/SOURCES/containers-storage.conf.5.md +++ b/SOURCES/containers-storage.conf.5.md @@ -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 + 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 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 diff --git a/SOURCES/containers-transports.5.md b/SOURCES/containers-transports.5.md index 6176324..c87283f 100644 --- a/SOURCES/containers-transports.5.md +++ b/SOURCES/containers-transports.5.md @@ -41,10 +41,14 @@ If `name` does not contain a slash, it is treated as `docker.io/library/name`. Otherwise, the component before the first slash is checked if it is recognized as a `hostname[:port]` (i.e., it contains either a . or a :, or the component is exactly localhost). If the first component of name is not recognized as a `hostname[:port]`, `name` is treated as `docker.io/name`. -### **docker-archive:**_path[:docker-reference]_ +### **docker-archive:**_path[:{docker-reference|@source-index}]_ An image is stored in the docker-save(1) formatted file. -_docker-reference_ is only used when creating such a file, and it must not contain a digest. +_docker-reference_ must not contain a digest. +Alternatively, for reading archives, @_source-index_ is a zero-based index in archive manifest +(to access untagged images). +If neither _docker-reference_ nor @_source_index is specified when reading an archive, the archive must contain exactly one image. + It is further possible to copy data to stdin by specifying `docker-archive:/dev/stdin` but note that the used file must be seekable. ### **docker-daemon:**_docker-reference|algo:digest_ diff --git a/SOURCES/containers.conf b/SOURCES/containers.conf index 780df2a..e657b58 100644 --- a/SOURCES/containers.conf +++ b/SOURCES/containers.conf @@ -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,18 +116,13 @@ # # env = [ # "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", +# "TERM=xterm", # ] # Pass all host environment variables into the container. # # env_host = false -# Path to OCI hooks directories for automatically executed hooks. -# -# hooks_dir = [ -# "/usr/share/containers/oci/hooks.d", -# ] - # Default proxy environment variables passed into the container. # The environment variables passed in include: # http_proxy, https_proxy, ftp_proxy, no_proxy, and the upper case versions of @@ -297,7 +292,13 @@ # Selects which logging mechanism to use for container engine events. # Valid values are `journald`, `file` and `none`. # -# events_logger = "journald" +events_logger = "file" + +# Path to OCI hooks directories for automatically executed hooks. +# +# hooks_dir = [ +# "/usr/share/containers/oci/hooks.d", +# ] # Default transport method for pulling and pushing for images # @@ -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,6 +338,10 @@ # # namespace = "" +# Path to the slirp4netns binary +# +# network_cmd_path="" + # Whether to use chroot instead of pivot_root in the runtime # # no_pivot_root = false diff --git a/SOURCES/containers.conf.5.md b/SOURCES/containers.conf.5.md index 88a0067..7352649 100644 --- a/SOURCES/containers.conf.5.md +++ b/SOURCES/containers.conf.5.md @@ -47,178 +47,206 @@ 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". + +List of devices. +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". + +List of volumes. +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. + +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. + +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 - `disabled` Disable cgroup support, will inherit cgroups from parent - `no-conmon` Container engine runs run without conmon + +Determines whether the container will create CGroups. +Options are: + `enabled` Enable cgroup support within container + `disabled` Disable cgroup support, will inherit cgroups from parent + `no-conmon` Container engine runs run without conmon **default_capabilities**=[] - List of default capabilities for containers. - The default list is: +List of default capabilities for containers. + +The default list is: ``` - default_capabilities = [ - "AUDIT_WRITE", - "CHOWN", - "DAC_OVERRIDE", - "FOWNER", - "FSETID", - "KILL", - "MKNOD", - "NET_BIND_SERVICE", - "NET_RAW", - "SETGID", - "SETPCAP", - "SETUID", - "SYS_CHROOT", - ] +default_capabilities = [ +"AUDIT_WRITE", + "CHOWN", + "DAC_OVERRIDE", + "FOWNER", + "FSETID", + "KILL", + "MKNOD", + "NET_BIND_SERVICE", + "NET_RAW", + "SETGID", + "SETPCAP", + "SETUID", + "SYS_CHROOT", +] ``` **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". + +A list of sysctls to be set in containers by default, +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". + +A list of ulimits to be set in containers by default, +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 + +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 + +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 + +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"] - Environment variable list for the container process, used for passing +**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. -**hooks_dir**=["/etc/containers/oci/hooks.d", ...] - Path to the OCI hooks directories for automatically executed hooks. +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: + +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 versions of these. The `no_proxy` option is needed when host system uses a proxy 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. + +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 + +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. + +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. + +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`. + +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 + +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. - `host` Share host NET Namespace with the container. - `none` Containers do not use the network. + +Default way to to create a NET namespace for the container. +Options are: + `private` Create private NET Namespace for the container. + `host` Share host NET Namespace with the container. + `none` Containers do not use the network. **no_hosts**=false - Create /etc/hosts for the container. By default, container engines manage + +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 + +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. + +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 + +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` must be greater + +Size of `/dev/shm`. The format is ``. `number` must be greater than `0`. - Unit is optional and can be: +Unit is optional and can be: `b` (bytes), `k` (kilobytes), `m`(megabytes), or `g` (gigabytes). 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: - `tz="local"` - `tz="America/New_York"` + +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: + `tz="local"` + `tz="America/New_York"` **umask**="0022" - Sets umask inside the container. + +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. + +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. + +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 + +Number of UIDs to allocate for the automatic container creation. UIDs are allocated from the “container” UIDs listed in /etc/subuid & /etc/subgid. ## NETWORK TABLE @@ -226,55 +254,64 @@ 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. + +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. + +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. + +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` + +The cgroup management implementation used for the runtime. Supports `cgroupfs` and `systemd`. **conmon_env_vars**=[] - Environment variables to pass into Conmon. + +Environment variables to pass into Conmon. **conmon_path**=[] - Paths to search for the conmon container manager binary. If the paths are + +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. - The default list is: +The default list is: ``` conmon_path=[ - "/usr/libexec/podman/conmon", - "/usr/local/libexec/podman/conmon", - "/usr/local/lib/podman/conmon", - "/usr/bin/conmon", - "/usr/sbin/conmon", - "/usr/local/bin/conmon", - "/usr/local/sbin/conmon", - "/run/current-system/sw/bin/conmon", + "/usr/libexec/podman/conmon", + "/usr/local/libexec/podman/conmon", + "/usr/local/lib/podman/conmon", + "/usr/bin/conmon", + "/usr/sbin/conmon", + "/usr/local/bin/conmon", + "/usr/local/sbin/conmon", + "/run/current-system/sw/bin/conmon", ] ``` **detach_keys**="ctrl-p,ctrl-q" - Keys sequence used for detaching a container. - Specify the keys sequence used to detach a container. + +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 `ctrl-`, where `` is one of: `a-z`, `@`, `^`, `[`, `\`, `]`, `^` or `_` **enable_port_reservation**=true - Determines whether the engine will reserve ports on the host when they are + +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 they cannot be reused by other programs on the host. However, this can cause @@ -282,68 +319,92 @@ 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`. + +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. + +Default transport method for pulling and pushing images. **infra_command**="/pause" - Command to run the infra container. + +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 + +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". + +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 + +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 "", - which corresponds to no namespace. When no namespace is set, all containers +which corresponds to no namespace. When no namespace is set, all containers and pods are visible. +**network_cmd_path**="" + +Path to the slirp4netns binary. + **no_pivot_root**=false - Whether to use chroot instead of pivot_root in the runtime. + +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 + +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. + +Name of destination for accessing the Podman service. **[service_destinations]** **[service_destinations.{name}]** - **uri="ssh://user@production.example.com/run/user/1001/podman/podman.sock"** +**uri="ssh://user@production.example.com/run/user/1001/podman/podman.sock"** - Example URIs: + Example URIs: - **rootless local** - unix://run/user/1000/podman/podman.sock - **rootless remote** - ssh://user@engineering.lab.company.com/run/user/1000/podman/podman.sock - **rootfull local** - unix://run/podman/podman.sock - **rootfull remote** - ssh://root@10.10.1.136:22/run/podman/podman.sock - **identity="~/.ssh/id_rsa** - Path to file containing ssh identity key +**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. @@ -351,38 +412,49 @@ 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 + +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`. + +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. + +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. + +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). + +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. + +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. + +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 + +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 +By default this will be configured relative to where containers/storage store 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 @@ -396,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) diff --git a/SOURCES/seccomp.json b/SOURCES/seccomp.json index d2cedab..07cdd6c 100644 --- a/SOURCES/seccomp.json +++ b/SOURCES/seccomp.json @@ -71,7 +71,7 @@ "clock_getres", "clock_gettime", "clock_nanosleep", - "clone", + "clone", "close", "connect", "copy_file_range", @@ -93,6 +93,7 @@ "exit", "exit_group", "faccessat", + "faccessat2", "fadvise64", "fadvise64_64", "fallocate", @@ -220,6 +221,7 @@ "newfstatat", "open", "openat", + "openat2", "pause", "pipe", "pipe2", diff --git a/SOURCES/storage.conf b/SOURCES/storage.conf index f6eeeb1..a341e25 100644 --- a/SOURCES/storage.conf +++ b/SOURCES/storage.conf @@ -47,7 +47,7 @@ additionalimagestores = [ # remap-group = "containers" # Root-auto-userns-user is a user name which can be used to look up one or more UID/GID -# ranges in the /etc/subuid and /etc/subgid file. These ranges will be partioned +# ranges in the /etc/subuid and /etc/subgid file. These ranges will be partitioned # to containers configured to create automatically a user namespace. Containers # configured to automatically create a user namespace can still overlap with containers # having an explicit mapping set. @@ -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 = "" diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec index 4380621..fc3e2a8 100644 --- a/SPECS/skopeo.spec +++ b/SPECS/skopeo.spec @@ -11,45 +11,60 @@ %if 0%{?rhel} > 7 && ! 0%{?fedora} %define gobuild(o:) \ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; +%else +%define gobuild(o:) GO111MODULE=off go build -buildmode pie -compiler gc -tags="rpm_crashtraceback ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '-Wl,-z,relro -Wl,-z,now -specs=/usr/lib/rpm/redhat/redhat-hardened-ld '" -a -v -x %{?**}; %endif -%global provider github -%global provider_tld com -%global project containers -%global repo skopeo -# https://github.com/containers/skopeo -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global git0 https://%{import_path} -%global branch master +%global import_path github.com/containers/skopeo +%global branch release-1.2 +%if 0%{?branch:1} +%global podman_branch v2.1.1-rhel +%global image_branch v5.6.0 +%global common_branch v0.22.0 +%global storage_branch v1.23.5 +%global fedora_branch f32 +%else +%global podman_branch master +%global image_branch master +%global common_branch master +%global storage_branch master +%global fedora_branch master +%endif +%global commit0 2b4097bc13e7ba1d16a5225e2292a5cf88072f63 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 1 -Name: %{repo} -Version: 1.1.1 -Release: 3%{?dist} +Name: skopeo +Version: 1.2.0 +Release: 4%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} # Build fails with: No matching package to install: 'golang >= 1.12.12-4' on i686 ExcludeArch: i686 -Source0: %{git0}/archive/v%{version}.tar.gz -#Source1: https://raw.githubusercontent.com/containers/storage/%%{branch}/storage.conf -Source1: https://src.fedoraproject.org/rpms/skopeo/raw/master/f/storage.conf -Source2: https://raw.githubusercontent.com/containers/storage/%{branch}/docs/containers-storage.conf.5.md +%if 0%{?branch:1} +Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz +%else +Source0: https://%{import_path}/archive/%{commit0}/%{name}-%{version}-%{shortcommit0}.tar.gz +%endif +#Source1: https://raw.githubusercontent.com/containers/storage/%%{storage_branch}/storage.conf +Source1: https://src.fedoraproject.org/rpms/skopeo/raw/%{fedora_branch}/f/storage.conf +Source2: https://raw.githubusercontent.com/containers/storage/%{storage_branch}/docs/containers-storage.conf.5.md Source3: mounts.conf -Source4: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-registries.conf.5.md +Source4: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-registries.conf.5.md Source5: registries.conf -Source6: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-policy.json.5.md -#Source7: https://raw.githubusercontent.com/containers/libpod/%%{branch}/seccomp.json -Source7: https://src.fedoraproject.org/rpms/skopeo/raw/master/f/seccomp.json -Source8: https://raw.githubusercontent.com/containers/libpod/%{branch}/docs/source/markdown/containers-mounts.conf.5.md -Source9: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-signature.5.md -Source10: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-transports.5.md -Source11: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-certs.d.5.md -Source12: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-registries.d.5.md -Source13: https://raw.githubusercontent.com/containers/common/%{branch}/pkg/config/containers.conf -Source14: https://raw.githubusercontent.com/containers/common/%{branch}/docs/containers.conf.5.md -Source15: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-auth.json.5.md +Source6: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-policy.json.5.md +#Source7: https://raw.githubusercontent.com/containers/podman/%%{podman_branch}/seccomp.json +Source7: https://src.fedoraproject.org/rpms/skopeo/raw/%{fedora_branch}/f/seccomp.json +Source8: https://raw.githubusercontent.com/containers/podman/%{podman_branch}/docs/source/markdown/containers-mounts.conf.5.md +Source9: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-signature.5.md +Source10: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-transports.5.md +Source11: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-certs.d.5.md +Source12: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-registries.d.5.md +Source13: https://raw.githubusercontent.com/containers/common/%{common_branch}/pkg/config/containers.conf +Source14: https://raw.githubusercontent.com/containers/common/%{common_branch}/docs/containers.conf.5.md +Source15: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-auth.json.5.md +Source16: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-registries.conf.d.5.md BuildRequires: git BuildRequires: golang >= 1.12.12-4 BuildRequires: go-md2man @@ -95,7 +110,13 @@ Requires: httpd-tools This package contains system tests for %{name} %prep -%autosetup -Sgit +%if 0%{?branch:1} +%autosetup -Sgit -n containers-%{name}-%{shortcommit0} +%else +%autosetup -Sgit -n %{name}-%{commit0} +%endif +sed -i 's/install-binary: bin\/%{name}/install-binary:/' Makefile +sed -i 's/install-docs: docs/install-docs:/' Makefile %build mkdir -p src/github.com/containers @@ -113,7 +134,8 @@ export GOPATH=$(pwd):$(pwd)/vendor:%{gopath} export GO111MODULE=off export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" export BUILDTAGS="exclude_graphdriver_btrfs btrfs_noversion $(hack/libdm_tag.sh) $(hack/ostree_tag.sh)" -%gobuild -o %{name} ./cmd/%{name} +mkdir -p bin +%gobuild -o bin/%{name} ./cmd/%{name} %{__make} docs %install @@ -121,11 +143,10 @@ make \ DESTDIR=%{buildroot} \ SIGSTOREDIR=%{buildroot}%{_sharedstatedir}/containers/sigstore \ install -mkdir -p %{buildroot}%{_sysconfdir} -mkdir -p %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d} -mkdir -p %{buildroot}%{_mandir}/man5 +install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d} install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/storage.conf -install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/ +install -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/registries.conf +install -dp %{buildroot}%{_mandir}/man5 go-md2man -in %{SOURCE2} -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5 go-md2man -in %{SOURCE4} -out %{buildroot}%{_mandir}/man5/containers-registries.conf.5 go-md2man -in %{SOURCE6} -out %{buildroot}%{_mandir}/man5/containers-policy.json.5 @@ -136,8 +157,9 @@ go-md2man -in %{SOURCE11} -out %{buildroot}%{_mandir}/man5/containers-certs.d.5 go-md2man -in %{SOURCE12} -out %{buildroot}%{_mandir}/man5/containers-registries.d.5 go-md2man -in %{SOURCE14} -out %{buildroot}%{_mandir}/man5/containers.conf.5 go-md2man -in %{SOURCE15} -out %{buildroot}%{_mandir}/man5/containers-auth.json.5 +go-md2man -in %{SOURCE16} -out %{buildroot}%{_mandir}/man5/containers-registries.conf.d.5 -mkdir -p %{buildroot}%{_datadir}/containers +install -dp %{buildroot}%{_datadir}/containers install -m0644 %{SOURCE3} %{buildroot}%{_datadir}/containers/mounts.conf install -m0644 %{SOURCE7} %{buildroot}%{_datadir}/containers/seccomp.json install -m0644 %{SOURCE13} %{buildroot}%{_datadir}/containers/containers.conf @@ -197,6 +219,25 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Thu Nov 05 2020 Jindrich Novy - 1:1.2.0-4 +- change default logging mechanism to use for container engine events + in containers.conf to be events_logger = "file" - it should fix + RHEL gating tests for podman nonroot (thanks to Dan Walsh) +- Related: #1888571 + +* Thu Nov 05 2020 Jindrich Novy - 1:1.2.0-3 +- simplify spec file +- use short commit ID in tarball name +- Related: #1888571 + +* Fri Oct 23 2020 Jindrich Novy - 1:1.2.0-2 +- use shortcommit ID in branch tarball name +- Related: #1888571 + +* Thu Oct 22 2020 Jindrich Novy - 1:1.2.0-1 +- synchronize with stream-container-tools-rhel8-rhel-8.4.0 +- Related: #1888571 + * Tue Aug 11 2020 Jindrich Novy - 1:1.1.1-3 - propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization - Related: #1821193