import skopeo-1.2.0-9.module+el8.3.1+9857+68fb1526

.gitignore

@@ -1 +1 @@
-SOURCES/v1.1.1.tar.gz
+SOURCES/release-1.2-2b4097b.tar.gz

.skopeo.metadata

@@ -1 +1 @@
-997b1d28c341f37e655d19534d29073aca424cd4 SOURCES/v1.1.1.tar.gz
+61fb0362a46065dd096e03a13b9cc81d1ba469f6 SOURCES/release-1.2-2b4097b.tar.gz

SOURCES/containers-mounts.conf.5.md

@@ -10,7 +10,7 @@ The mounts.conf file specifies volume mount directories that are automatically m
 The format of the mounts.conf is the volume format `/SRC:/DEST`, one mount per line. For example, a mounts.conf with the line `/usr/share/secrets:/run/secrets` would cause the contents of the `/usr/share/secrets` directory on the host to be mounted on the `/run/secrets` directory inside the container. Setting mountpoints allows containers to use the files of the host, for instance, to use the host's subscription to some enterprise Linux distribution.
 
 ## FILES
-Some distributions may provide a `/usr/share/containers/mounts.conf` file to provide default mounts, but users can create a `/etc/containers/mounts.conf`, to specify their own special volumes to mount in the container.
+Some distributions may provide a `/usr/share/containers/mounts.conf` file to provide default mounts, but users can create a `/etc/containers/mounts.conf`, to specify their own special volumes to mount in the container. When Podman runs in rootless mode, the file `$HOME/.config/containers/mounts.conf` will override the default if it exists.
 
 ## HISTORY
 Aug 2018, Originally compiled by Valentin Rothberg <vrothberg@suse.com>

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 <rothberg@redhat.com>

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

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 environment variable substitutions (ie. `$HOME/containers/storage`)
-    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
 
   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
 

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_

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

SOURCES/containers.conf.5.md

@@ -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',
+Specified as 'device-on-host:device-on-container:permissions'.
-  for example: "/dev/sdc:/dev/xvdc:rwm".
+Example: "/dev/sdc:/dev/xvdc:rwm".
 
 **volumes**=[]
+
 List of volumes.
-  Specified as "directory-on-host:directory-in-container:options",
+Specified as "directory-on-host:directory-in-container:options".
-  for example:  "/db:/var/lib/db:ro".
+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,39 +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",
+specified as "name=value".
-for example:"net.ipv4.ping_group_range=0 1000".
+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",
+specified as "name=soft-limit:hard-limit".
-for example:"nofile=1024:2048".
+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.
 
-**hooks_dir**=["/etc/containers/oci/hooks.d", ...]
-  Path to the OCI hooks directories for automatically executed hooks.
-
 **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
@@ -137,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.
@@ -170,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:
@@ -196,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:
@@ -203,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.
 
@@ -226,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.
@@ -267,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
@@ -274,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
@@ -282,50 +319,72 @@ 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 "",
 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.
 
 **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]**
@@ -341,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.
@@ -351,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
@@ -383,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
@@ -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)
 

SOURCES/registries.conf

@@ -61,7 +61,7 @@ registries = []
 # mirrors:
 #
 # # An array of host[:port] registries to try when pulling an unqualified image, in order.
-# unqualified-search-registries = ["example.com"]
+unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "registry.centos.org", "docker.io"]
 #
 # [[registry]]
 # # The "prefix" field is used to choose the relevant [[registry]] TOML table;

SOURCES/seccomp.json

@@ -68,9 +68,13 @@
 				"chown",
 				"chown32",
 				"clock_adjtime",
+				"clock_adjtime64",
 				"clock_getres",
+				"clock_getres_time64",
 				"clock_gettime",
+				"clock_gettime64",
 				"clock_nanosleep",
+				"clock_nanosleep_time64",
 				"clone",
 				"close",
 				"connect",
@@ -93,6 +97,7 @@
 				"exit",
 				"exit_group",
 				"faccessat",
+				"faccessat2",
 				"fadvise64",
 				"fadvise64_64",
 				"fallocate",
@@ -220,18 +225,22 @@
 				"newfstatat",
 				"open",
 				"openat",
+				"openat2",
 				"pause",
+				"pidfd_getfd",
 				"pipe",
 				"pipe2",
 				"pivot_root",
 				"poll",
 				"ppoll",
+				"ppoll_time64",
 				"prctl",
 				"pread64",
 				"preadv",
 				"preadv2",
 				"prlimit64",
 				"pselect6",
+				"pselect6_time64",
 				"pwrite64",
 				"pwritev",
 				"pwritev2",
@@ -322,6 +331,7 @@
 				"signalfd4",
 				"sigreturn",
 				"socket",
+				"socket",
 				"socketcall",
 				"socketpair",
 				"splice",
@@ -344,10 +354,13 @@
 				"timer_delete",
 				"timer_getoverrun",
 				"timer_gettime",
+				"timer_gettime64",
 				"timer_settime",
 				"timerfd_create",
 				"timerfd_gettime",
+				"timerfd_gettime64",
 				"timerfd_settime",
+				"timerfd_settime64",
 				"times",
 				"tkill",
 				"truncate",
@@ -362,6 +375,7 @@
 				"unshare",
 				"utime",
 				"utimensat",
+				"utimensat_time64",
 				"utimes",
 				"vfork",
 				"vmsplice",
@@ -748,7 +762,8 @@
 			"names": [
 				"settimeofday",
 				"stime",
-				"clock_settime"
+				"clock_settime",
+				"clock_settime64"
 			],
 			"action": "SCMP_ACT_ALLOW",
 			"args": [],

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.
@@ -82,6 +82,39 @@ mountopt = "nodev,metacopy=on"
 # Size is used to set a maximum size of the container image.
 # size = ""
 
+# ForceMask specifies the permissions mask that is used for new files and
+# directories.
+#
+# The values "shared" and "private" are accepted.
+# Octal permission masks are also accepted.
+#
+#  "": No value specified.
+#     All files/directories, get set with the permissions identified within the
+#     image.
+#  "private": it is equivalent to 0700.
+#     All files/directories get set with 0700 permissions.  The owner has rwx
+#     access to the files. No other users on the system can access the files.
+#     This setting could be used with networked based homedirs.
+#  "shared": it is equivalent to 0755.
+#     The owner has rwx access to the files and everyone else can read, access
+#     and execute them. This setting is useful for sharing containers storage
+#     with other users.  For instance have a storage owned by root but shared
+#     to rootless users as an additional store.
+#     NOTE:  All files within the image are made readable and executable by any
+#     user on the system. Even /etc/shadow within your image is now readable by
+#     any user.
+#
+#   OCTAL: Users can experiment with other OCTAL Permissions.
+#
+#  Note: The force_mask Flag is an experimental feature, it could change in the
+#  future.  When "force_mask" is set the original permission mask is stored in
+#  the "user.containers.override_stat" xattr and the "mount_program" option must
+#  be specified. Mount programs like "/usr/bin/fuse-overlayfs" present the
+#  extended attribute permissions to processes within containers rather then the
+#  "force_mask"  permissions.
+#
+# force_mask = ""
+
 [storage.options.thinpool]
 # Storage Options for thinpool
 
@@ -132,6 +165,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 = ""
 

SPECS/skopeo.spec

@@ -1,55 +1,62 @@
-%global with_debug 1
 %global with_check 0
 
-%if 0%{?with_debug}
 %global _find_debuginfo_dwz_opts %{nil}
 %global _dwz_low_mem_die_limit 0
-%else
-%global debug_package %{nil}
-%endif
 
 %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 %{?**};
+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 %{?**};
+%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 %{?**};
 %endif
 
-%global provider github
+%global import_path github.com/containers/skopeo
-%global provider_tld com
+%global branch release-1.2
-%global project containers
+# Bellow definitions are used to deliver config files from a particular branch
-%global repo skopeo
+# of c/image, c/common, c/storage vendored in all podman, skopeo, buildah.
-# https://github.com/containers/skopeo
+# These vendored components must have the same version. If it is not the case,
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
+# pick the oldest version on c/image, c/common, c/storage vendored in
-%global import_path %{provider_prefix}
+# podman/skopeo/podman.
-%global git0 https://%{import_path}
+%global podman_branch v2.2.1-rhel
-%global branch master
+%global image_branch  v5.6.0
+%global common_branch v0.22.0
+%global storage_branch v1.23.5
+%global fedora_branch f32
+%global commit0 2b4097bc13e7ba1d16a5225e2292a5cf88072f63
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Epoch: 1
-Name: %{repo}
+Name: skopeo
-Version: 1.1.1
+Version: 1.2.0
-Release: 3%{?dist}
+Release: 9%{?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
+%if 0%{?branch:1}
-#Source1: https://raw.githubusercontent.com/containers/storage/%%{branch}/storage.conf
+Source0: https://%{import_path}/tarball/%{commit0}/%{branch}-%{shortcommit0}.tar.gz
-Source1: https://src.fedoraproject.org/rpms/skopeo/raw/master/f/storage.conf
+%else
-Source2: https://raw.githubusercontent.com/containers/storage/%{branch}/docs/containers-storage.conf.5.md
+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
+Source6: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-policy.json.5.md
-#Source7: https://raw.githubusercontent.com/containers/libpod/%%{branch}/seccomp.json
+#Source7: https://raw.githubusercontent.com/containers/podman/%%{podman_branch}/seccomp.json
-Source7: https://src.fedoraproject.org/rpms/skopeo/raw/master/f/seccomp.json
+Source7: https://src.fedoraproject.org/rpms/skopeo/raw/%{fedora_branch}/f/seccomp.json
-Source8: https://raw.githubusercontent.com/containers/libpod/%{branch}/docs/source/markdown/containers-mounts.conf.5.md
+Source8: https://raw.githubusercontent.com/containers/podman/%{podman_branch}/docs/source/markdown/containers-mounts.conf.5.md
-Source9: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-signature.5.md
+Source9: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-signature.5.md
-Source10: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-transports.5.md
+Source10: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-transports.5.md
-Source11: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-certs.d.5.md
+Source11: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-certs.d.5.md
-Source12: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-registries.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/%{branch}/pkg/config/containers.conf
+Source13: https://raw.githubusercontent.com/containers/common/%{common_branch}/pkg/config/containers.conf
-Source14: https://raw.githubusercontent.com/containers/common/%{branch}/docs/containers.conf.5.md
+Source14: https://raw.githubusercontent.com/containers/common/%{common_branch}/docs/containers.conf.5.md
-Source15: https://raw.githubusercontent.com/containers/image/%{branch}/docs/containers-auth.json.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 +102,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 +126,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 +135,10 @@ make \
    DESTDIR=%{buildroot} \
    SIGSTOREDIR=%{buildroot}%{_sharedstatedir}/containers/sigstore \
    install
-mkdir -p %{buildroot}%{_sysconfdir}
+install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d}
-mkdir -p %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d}
-mkdir -p %{buildroot}%{_mandir}/man5
 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 +149,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 +211,50 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Mon Jan 11 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-9
+- upload proper source tarball
+- Related: #1888571
+
+* Mon Jan 11 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-8
+- revert back to version aimed at 8.3.1 - skopeo-1.2.0
+- also downgrade versions of vendored libraries
+- Related: #1888571
+
+* Mon Jan 11 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-1
+- update vendored component versions
+- update to the latest content of https://github.com/containers/skopeo/tree/release-1.2
+  (https://github.com/containers/skopeo/commit/2e90a8a)
+- Related: #1888571
+
+* Fri Jan 08 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-6
+- always build with debuginfo
+- use less verbose output when compiling
+- Related: #1888571
+
+* Thu Jan 07 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-5
+- re-sync config files
+- assure events_logger = "file"
+- Related: #1888571
+
+* Thu Nov 05 2020 Jindrich Novy <jnovy@redhat.com> - 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 <jnovy@redhat.com> - 1:1.2.0-3
+- simplify spec file
+- use short commit ID in tarball name
+- Related: #1888571
+
+* Fri Oct 23 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-2
+- use shortcommit ID in branch tarball name
+- Related: #1888571
+
+* Thu Oct 22 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.2.0-1
+- synchronize with stream-container-tools-rhel8-rhel-8.4.0
+- Related: #1888571
+
 * Tue Aug 11 2020 Jindrich Novy <jnovy@redhat.com> - 1:1.1.1-3
 - propagate proper CFLAGS to CGO_CFLAGS to assure code hardening and optimization
 - Related: #1821193