.gitignore

@@ -1 +1 @@
-SOURCES/skopeo-7d080ca.tar.gz
+SOURCES/skopeo-1715c90.tar.gz

.skopeo.metadata

@@ -1 +1 @@
-419bdfb62f8ac3f94cff70bc107e1f4656073c72 SOURCES/skopeo-7d080ca.tar.gz
+f258c639bda55165978c076e13bac72388e4ff14 SOURCES/skopeo-1715c90.tar.gz

SOURCES/containers-certs.d.5.md

@@ -1,28 +0,0 @@
-% containers-certs.d(5)
-
-# NAME
-containers-certs.d - Directory for storing custom container-registry TLS configurations
-
-# DESCRIPTION
-A custom TLS configuration for a container registry can be configured by creating a directory under `/etc/containers/certs.d`.
-The name of the directory must correspond to the `host:port` of the registry (e.g., `my-registry.com:5000`).
-
-## Directory Structure
-A certs directory can contain one or more files with the following extensions:
-
-* `*.crt`  files with this extensions will be interpreted as CA certificates
-* `*.cert` files with this extensions will be interpreted as client certificates
-* `*.key`  files with this extensions will be interpreted as client keys
-
-Note that the client certificate-key pair will be selected by the file name (e.g., `client.{cert,key}`).
-An examplary setup for a registry running at `my-registry.com:5000` may look as follows:
-```
-/etc/containers/certs.d/    <- Certificate directory
-└── my-registry.com:5000    <- Hostname:port
-   ├── client.cert          <- Client certificate
-   ├── client.key           <- Client key
-   └── ca.crt               <- Certificate authority that signed the registry certificate
-```
-
-# HISTORY
-Feb 2019, Originally compiled by Valentin Rothberg <rothberg@redhat.com>

SOURCES/containers-mounts.conf.5.md

@@ -1,16 +0,0 @@
-% containers-mounts.conf(5)
-
-## NAME
-containers-mounts.conf - configuration file for default mounts in containers
-
-## DESCRIPTION
-The mounts.conf file specifies volume mount directories that are automatically mounted inside containers. Container processes can then use this content. Usually these directories are used for passing secrets or credentials required by the package software to access remote package repositories. Note that for security reasons, tools adhering to the mounts.conf are expected to copy the contents instead of bind mounting the paths from the host.
-
-## FORMAT
-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.
-
-## HISTORY
-Aug 2018, Originally compiled by Valentin Rothberg <vrothberg@suse.com>

SOURCES/containers-registries.conf.5.md

@@ -1,177 +0,0 @@
-% CONTAINERS-REGISTRIES.CONF(5) System-wide registry configuration file
-% Brent Baude
-% Aug 2017
-
-# NAME
-containers-registries.conf - Syntax of System Registry Configuration File
-
-# DESCRIPTION
-The CONTAINERS-REGISTRIES configuration file is a system-wide configuration
-file for container image registries. The file format is TOML.
-
-By default, the configuration file is located at `/etc/containers/registries.conf`.
-
-# FORMATS
-
-## VERSION 2
-VERSION 2 is the latest format of the `registries.conf` and is currently in
-beta. This means in general VERSION 1 should be used in production environments
-for now.
-
-### GLOBAL SETTINGS
-
-`unqualified-search-registries`
-: An array of _host_[`:`_port_] registries to try when pulling an unqualified image, in order.
-
-### NAMESPACED `[[registry]]` SETTINGS
-
-The bulk of the configuration is represented as an array of `[[registry]]`
-TOML tables; the settings may therefore differ among different registries
-as well as among different namespaces/repositories within a registry.
-
-#### Choosing a `[[registry]]` TOML table
-
-Given an image name, a single `[[registry]]` TOML table is chosen based on its `prefix` field.
-
-`prefix`
-: A prefix of the user-specified image name, i.e. using one of the following formats:
-    - _host_[`:`_port_]
-    - _host_[`:`_port_]`/`_namespace_[`/`_namespace_…]
-    - _host_[`:`_port_]`/`_namespace_[`/`_namespace_…]`/`_repo_
-    - _host_[`:`_port_]`/`_namespace_[`/`_namespace_…]`/`_repo_(`:`_tag|`@`_digest_)
-
-    The user-specified image name must start with the specified `prefix` (and continue
-    with the appropriate separator) for a particular `[[registry]]` TOML table to be
-    considered; (only) the TOML table with the longest match is used.
-
-    As a special case, the `prefix` field can be missing; if so, it defaults to the value
-    of the `location` field (described below).
-
-#### Per-namespace settings
-
-`insecure`
-: `true` or `false`.
-    By default, container runtimes require TLS when retrieving images from a registry.
-    If `insecure` is set to `true`, unencrypted HTTP as well as TLS connections with untrusted
-    certificates are allowed.
-
-`blocked`
-: `true` or `false`.
-    If `true`, pulling images with matching names is forbidden.
-
-#### Remapping and mirroring registries
-
-The user-specified image reference is, primarily, a "logical" image name, always used for naming
-the image.  By default, the image reference also directly specifies the registry and repository
-to use, but the following options can be used to redirect the underlying accesses
-to different registry servers or locations (e.g. to support configurations with no access to the
-internet without having to change `Dockerfile`s, or to add redundancy).
-
-`location`
-: Accepts the same format as the `prefix` field, and specifies the physical location
-    of the `prefix`-rooted namespace.
-
-    By default, this equal to `prefix` (in which case `prefix` can be omitted and the
-    `[[registry]]` TOML table can only specify `location`).
-
-    Example: Given
-    ```
-    prefix = "example.com/foo"
-    location = "internal-registry-for-example.net/bar"
-    ```
-    requests for the image `example.com/foo/myimage:latest` will actually work with the
-    `internal-registry-for-example.net/bar/myimage:latest` image.
-
-`mirror`
-: An array of TOML tables specifying (possibly-partial) mirrors for the
-    `prefix`-rooted namespace.
-
-    The mirrors are attempted in the specified order; the first one that can be
-    contacted and contains the image will be used (and if none of the mirrors contains the image,
-    the primary location specified by the `registry.location` field, or using the unmodified
-    user-specified reference, is tried last).
-
-    Each TOML table in the `mirror` array can contain the following fields, with the same semantics
-    as if specified in the `[[registry]]` TOML table directly:
-    - `location`
-    - `insecure`
-
-`mirror-by-digest-only`
-: `true` or `false`.
-    If `true`, mirrors will only be used during pulling if the image reference includes a digest.
-    Referencing an image by digest ensures that the same is always used
-    (whereas referencing an image by a tag may cause different registries to return
-    different images if the tag mapping is out of sync).
-
-    Note that if this is `true`, images referenced by a tag will only use the primary
-    registry, failing if that registry is not accessible.
-
-*Note*: Redirection and mirrors are currently processed only when reading images, not when pushing
-to a registry; that may change in the future.
-
-### EXAMPLE
-
-```
-unqualified-search-registries = ["example.com"]
-
-[[registry]]
-prefix = "example.com/foo"
-insecure = false
-blocked = false
-location = "internal-registry-for-example.com/bar"
-
-[[registry.mirror]]
-location = "example-mirror-0.local/mirror-for-foo"
-
-[[registry.mirror]]
-location = "example-mirror-1.local/mirrors/foo"
-insecure = true
-```
-Given the above, a pull of `example.com/foo/image:latest` will try:
-    1. `example-mirror-0.local/mirror-for-foo/image:latest`
-    2. `example-mirror-1.local/mirrors/foo/image:latest`
-    3. `internal-registry-for-example.net/bar/myimage:latest`
-
-in order, and use the first one that exists.
-
-## VERSION 1
-VERSION 1 can be used as alternative to the VERSION 2, but it does not support
-using registry mirrors, longest-prefix matches, or location rewriting.
-
-The TOML format is used to build a simple list of registries under three
-categories: `registries.search`, `registries.insecure`, and `registries.block`.
-You can list multiple registries using a comma separated list.
-
-Search registries are used when the caller of a container runtime does not fully specify the
-container image that they want to execute.  These registries are prepended onto the front
-of the specified container image until the named image is found at a registry.
-
-Note that insecure registries can be used for any registry, not just the registries listed
-under search.
-
-The `registries.insecure` and `registries.block` lists have the same meaning as the
-`insecure` and `blocked` fields in VERSION 2.
-
-### EXAMPLE
-The following example configuration defines two searchable registries, one
-insecure registry, and two blocked registries.
-
-```
-[registries.search]
-registries = ['registry1.com', 'registry2.com']
-
-[registries.insecure]
-registries = ['registry3.com']
-
-[registries.block]
-registries = ['registry.untrusted.com', 'registry.unsafe.com']
-```
-
-# HISTORY
-Mar 2019, Added additional configuration format by Sascha Grunert <sgrunert@suse.com>
-
-Aug 2018, Renamed to containers-registries.conf(5) by Valentin Rothberg <vrothberg@suse.com>
-
-Jun 2018, Updated by Tom Sweeney <tsweeney@redhat.com>
-
-Aug 2017, Originally compiled by Brent Baude <bbaude@redhat.com>

SOURCES/containers-registries.d.5.md

@@ -1,128 +0,0 @@
-% CONTAINERS-REGISTRIES.D(5) Registries.d Man Page
-% Miloslav Trmač
-% August 2016
-
-# NAME
-containers-registries.d - Directory for various registries configurations
-
-# DESCRIPTION
-
-The registries configuration directory contains configuration for various registries
-(servers storing remote container images), and for content stored in them,
-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`;
-applications may allow using a different directory instead.
-
-## Directory Structure
-
-The directory may contain any number of files with the extension `.yaml`,
-each using the YAML format.  Other than the mandatory extension, names of the files
-don’t matter.
-
-The contents of these files are merged together; to have a well-defined and easy to understand
-behavior, there can be only one configuration section describing a single namespace within a registry
-(in particular there can be at most one one `default-docker` section across all files,
-and there can be at most one instance of any key under the the `docker` section;
-these sections are documented later).
-
-Thus, it is forbidden to have two conflicting configurations for a single registry or scope,
-and it is also forbidden to split a configuration for a single registry or scope across
-more than one file (even if they are not semantically in conflict).
-
-## Registries, Scopes and Search Order
-
-Each YAML file must contain a “YAML mapping” (key-value pairs).  Two top-level keys are defined:
-
-- `default-docker` is the _configuration section_ (as documented below)
-   for registries implementing "Docker Registry HTTP API V2".
-
-   This key is optional.
-
-- `docker` is a mapping, using individual registries implementing "Docker Registry HTTP API V2",
-   or namespaces and individual images within these registries, as keys;
-   the value assigned to any such key is a _configuration section_.
-
-   This key is optional.
-
-   Scopes matching individual images are named Docker references *in the fully expanded form*, either
-   using a tag or digest. For example, `docker.io/library/busybox:latest` (*not* `busybox:latest`).
-
-   More general scopes are prefixes of individual-image scopes, and specify a repository (by omitting the tag or digest),
-   a repository namespace, or a registry host (and a port if it differs from the default).
-
-   Note that if a registry is accessed using a hostname+port configuration, the port-less hostname
-   is _not_ used as parent scope.
-
-When searching for a configuration to apply for an individual container image, only
-the configuration for the most-precisely matching scope is used; configuration using
-more general scopes is ignored.  For example, if _any_ configuration exists for
-`docker.io/library/busybox`, the configuration for `docker.io` is ignored
-(even if some element of the configuration is defined for `docker.io` and not for `docker.io/library/busybox`).
-
-## Individual Configuration Sections
-
-A single configuration section is selected for a container image using the process
-described above.  The configuration section is a YAML mapping, with the following keys:
-
-- `sigstore-staging` defines an URL of of the signature storage, used for editing it (adding or deleting signatures).
-
-   This key is optional; if it is missing, `sigstore` below is used.
-
-- `sigstore` defines an URL of the signature storage.
-   This URL is used for reading existing signatures,
-   and if `sigstore-staging` does not exist, also for adding or removing them.
-
-   This key is optional; if it is missing, no signature storage is defined (no signatures
-   are download along with images, adding new signatures is possible only if `sigstore-staging` is defined).
-
-## Examples
-
-### Using Containers from Various Origins
-
-The following demonstrates how to to consume and run images from various registries and namespaces:
-
-```yaml
-docker:
-    registry.database-supplier.com:
-        sigstore: https://sigstore.database-supplier.com
-    distribution.great-middleware.org:
-        sigstore: https://security-team.great-middleware.org/sigstore
-    docker.io/web-framework:
-        sigstore: https://sigstore.web-framework.io:8080
-```
-
-### Developing and Signing Containers, Staging Signatures
-
-For developers in `example.com`:
-
-- Consume most container images using the public servers also used by clients.
-- Use a separate sigure storage for an container images in a namespace corresponding to the developers' department, with a staging storage used before publishing signatures.
-- Craft an individual exception for a single branch a specific developer is working on locally.
-
-```yaml
-docker:
-    registry.example.com:
-        sigstore: https://registry-sigstore.example.com
-    registry.example.com/mydepartment:
-        sigstore: https://sigstore.mydepartment.example.com
-        sigstore-staging: file:///mnt/mydepartment/sigstore-staging
-    registry.example.com/mydepartment/myproject:mybranch:
-        sigstore: http://localhost:4242/sigstore
-        sigstore-staging: file:///home/useraccount/webroot/sigstore
-```
-
-### A Global Default
-
-If a company publishes its products using a different domain, and different registry hostname for each of them, it is still possible to use a single signature storage server
-without listing each domain individually. This is expected to rarely happen, usually only for staging new signatures.
-
-```yaml
-default-docker:
-    sigstore-staging: file:///mnt/company/common-sigstore-staging
-```
-
-# AUTHORS
-
-Miloslav Trmač <mitr@redhat.com>

SOURCES/containers-signature.5.md

@@ -1,241 +0,0 @@
-% container-signature(5) Container signature format
-% Miloslav Trmač
-% March 2017
-
-# Container signature format
-
-This document describes the format of container signatures,
-as implemented by the `github.com/containers/image/signature` package.
-
-Most users should be able to consume these signatures by using the `github.com/containers/image/signature` package
-(preferably through the higher-level `signature.PolicyContext` interface)
-without having to care about the details of the format described below.
-This documentation exists primarily for maintainers of the package
-and to allow independent reimplementations.
-
-## High-level overview
-
-The signature provides an end-to-end authenticated claim that a container image
-has been approved by a specific party (e.g. the creator of the image as their work,
-an automated build system as a result of an automated build,
-a company IT department approving the image for production) under a specified _identity_
-(e.g. an OS base image / specific application, with a specific version).
-
-A container signature consists of a cryptographic signature which identifies
-and authenticates who signed the image, and carries as a signed payload a JSON document.
-The JSON document identifies the image being signed, claims a specific identity of the
-image and if applicable, contains other information about the image.
-
-The signatures do not modify the container image (the layers, configuration, manifest, …);
-e.g. their presence does not change the manifest digest used to identify the image in
-docker/distribution servers; rather, the signatures are associated with an immutable image.
-An image can have any number of signatures so signature distribution systems SHOULD support
-associating more than one signature with an image.
-
-## The cryptographic signature
-
-As distributed, the container signature is a blob which contains a cryptographic signature
-in an industry-standard format, carrying a signed JSON payload (i.e. the blob contains both the
-JSON document and a signature of the JSON document; it is not a “detached signature” with
-independent blobs containing the JSON document and a cryptographic signature).
-
-Currently the only defined cryptographic signature format is an OpenPGP signature (RFC 4880),
-but others may be added in the future.  (The blob does not contain metadata identifying the
-cryptographic signature format. It is expected that most formats are sufficiently self-describing
-that this is not necessary and the configured expected public key provides another indication
-of the expected cryptographic signature format. Such metadata may be added in the future for
-newly added cryptographic signature formats, if necessary.)
-
-Consumers of container signatures SHOULD verify the cryptographic signature
-against one or more trusted public keys
-(e.g. defined in a [policy.json signature verification policy file](policy.json.md))
-before parsing or processing the JSON payload in _any_ way,
-in particular they SHOULD stop processing the container signature
-if the cryptographic signature verification fails, without even starting to process the JSON payload.
-
-(Consumers MAY extract identification of the signing key and other metadata from the cryptographic signature,
-and the JSON payload, without verifying the signature, if the purpose is to allow managing the signature blobs,
-e.g. to list the authors and image identities of signatures associated with a single container image;
-if so, they SHOULD design the output of such processing to minimize the risk of users considering the output trusted
-or in any way usable for making policy decisions about the image.)
-
-### OpenPGP signature verification
-
-When verifying a cryptographic signature in the OpenPGP format,
-the consumer MUST verify at least the following aspects of the signature
-(like the `github.com/containers/image/signature` package does):
-
-- The blob MUST be a “Signed Message” as defined RFC 4880 section 11.3.
-  (e.g. it MUST NOT be an unsigned “Literal Message”, or any other non-signature format).
-- The signature MUST have been made by an expected key trusted for the purpose (and the specific container image).
-- The signature MUST be correctly formed and pass the cryptographic validation.
-- The signature MUST correctly authenticate the included JSON payload
-  (in particular, the parsing of the JSON payload MUST NOT start before the complete payload has been cryptographically authenticated).
-- The signature MUST NOT be expired.
-
-The consumer SHOULD have tests for its verification code which verify that signatures failing any of the above are rejected.
-
-## JSON processing and forward compatibility
-
-The payload of the cryptographic signature is a JSON document (RFC 7159).
-Consumers SHOULD parse it very strictly,
-refusing any signature which violates the expected format (e.g. missing members, incorrect member types)
-or can be interpreted ambiguously (e.g. a duplicated member in a JSON object).
-
-Any violations of the JSON format or of other requirements in this document MAY be accepted if the JSON document can be recognized
-to have been created by a known-incorrect implementation (see [`optional.creator`](#optionalcreator) below)
-and if the semantics of the invalid document, as created by such an implementation, is clear.
-
-The top-level value of the JSON document MUST be a JSON object with exactly two members, `critical` and `optional`,
-each a JSON object.
-
-The `critical` object MUST contain a `type` member identifying the document as a container signature
-(as defined [below](#criticaltype))
-and signature consumers MUST reject signatures which do not have this member or in which this member does not have the expected value.
-
-To ensure forward compatibility (allowing older signature consumers to correctly
-accept or reject signatures created at a later date, with possible extensions to this format),
-consumers MUST reject the signature if the `critical` object, or _any_ of its subobjects,
-contain _any_ member or data value which is unrecognized, unsupported, invalid, or in any other way unexpected.
-At a minimum, this includes unrecognized members in a JSON object, or incorrect types of expected members.
-
-For the same reason, consumers SHOULD accept any members with unrecognized names in the `optional` object,
-and MAY accept signatures where the object member is recognized but unsupported, or the value of the member is unsupported.
-Consumers still SHOULD reject signatures where a member of an `optional` object is supported but the value is recognized as invalid.
-
-## JSON data format
-
-An example of the full format follows, with detailed description below.
-To reiterate, consumers of the signature SHOULD perform successful cryptographic verification,
-and MUST reject unexpected data in the `critical` object, or in the top-level object, as described above.
-
-```json
-{
-    "critical": {
-        "type": "atomic container signature",
-        "image": {
-            "docker-manifest-digest": "sha256:817a12c32a39bbe394944ba49de563e085f1d3c5266eb8e9723256bc4448680e"
-        },
-        "identity": {
-            "docker-reference": "docker.io/library/busybox:latest"
-        }
-    },
-    "optional": {
-        "creator": "some software package v1.0.1-35",
-        "timestamp": 1483228800,
-    }
-}
-```
-
-### `critical`
-
-This MUST be a JSON object which contains data critical to correctly evaluating the validity of a signature.
-
-Consumers MUST reject any signature where the `critical` object contains any unrecognized, unsupported, invalid or in any other way unexpected member or data.
-
-### `critical.type`
-
-This MUST be a string with a string value exactly equal to `atomic container signature` (three words, including the spaces).
-
-Signature consumers MUST reject signatures which do not have this member or this member does not have exactly the expected value.
-
-(The consumers MAY support signatures with a different value of the `type` member, if any is defined in the future;
-if so, the rest of the JSON document is interpreted according to rules defining that value of `critical.type`,
-not by this document.)
-
-### `critical.image`
-
-This MUST be a JSON object which identifies the container image this signature applies to.
-
-Consumers MUST reject any signature where the `critical.image` object contains any unrecognized, unsupported, invalid or in any other way unexpected member or data.
-
-(Currently only the `docker-manifest-digest` way of identifying a container image is defined;
-alternatives to this may be defined in the future,
-but existing consumers are required to reject signatures which use formats they do not support.)
-
-### `critical.image.docker-manifest-digest`
-
-This MUST be a JSON string, in the `github.com/opencontainers/go-digest.Digest` string format.
-
-The value of this member MUST match the manifest of the signed container image, as implemented in the docker/distribution manifest addressing system.
-
-The consumer of the signature SHOULD verify the manifest digest against a fully verified signature before processing the contents of the image manifest in any other way
-(e.g. parsing the manifest further or downloading layers of the image).
-
-Implementation notes:
-* A single container image manifest may have several valid manifest digest values, using different algorithms.
-* For “signed” [docker/distribution schema 1](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-1.md) manifests,
-the manifest digest applies to the payload of the JSON web signature, not to the raw manifest blob.
-
-### `critical.identity`
-
-This MUST be a JSON object which identifies the claimed identity of the image (usually the purpose of the image, or the application, along with a version information),
-as asserted by the author of the signature.
-
-Consumers MUST reject any signature where the `critical.identity` object contains any unrecognized, unsupported, invalid or in any other way unexpected member or data.
-
-(Currently only the `docker-reference` way of claiming an image identity/purpose is defined;
-alternatives to this may be defined in the future,
-but existing consumers are required to reject signatures which use formats they do not support.)
-
-### `critical.identity.docker-reference`
-
-This MUST be a JSON string, in the `github.com/docker/distribution/reference` string format,
-and using the same normalization semantics (where e.g. `busybox:latest` is equivalent to `docker.io/library/busybox:latest`).
-If the normalization semantics allows multiple string representations of the claimed identity with equivalent meaning,
-the `critical.identity.docker-reference` member SHOULD use the fully explicit form (including the full host name and namespaces).
-
-The value of this member MUST match the image identity/purpose expected by the consumer of the image signature and the image
-(again, accounting for the `docker/distribution/reference` normalization semantics).
-
-In the most common case, this means that the `critical.identity.docker-reference` value must be equal to the docker/distribution reference used to refer to or download the image.
-However, depending on the specific application, users or system administrators may accept less specific matches
-(e.g. ignoring the tag value in the signature when pulling the `:latest` tag or when referencing an image by digest),
-or they may require `critical.identity.docker-reference` values with a completely different namespace to the reference used to refer to/download the image
-(e.g. requiring a `critical.identity.docker-reference` value which identifies the image as coming from a supplier when fetching it from a company-internal mirror of approved images).
-The software performing this verification SHOULD allow the users to define such a policy using the [policy.json signature verification policy file format](policy.json.md).
-
-The `critical.identity.docker-reference` value SHOULD contain either a tag or digest;
-in most cases, it SHOULD use a tag rather than a digest.  (See also the default [`matchRepoDigestOrExact` matching semantics in `policy.json`](policy.json.md#signedby).)
-
-### `optional`
-
-This MUST be a JSON object.
-
-Consumers SHOULD accept any members with unrecognized names in the `optional` object,
-and MAY accept a signature where the object member is recognized but unsupported, or the value of the member is valid but unsupported.
-Consumers still SHOULD reject any signature where a member of an `optional` object is supported but the value is recognized as invalid.
-
-### `optional.creator`
-
-If present, this MUST be a JSON string, identifying the name and version of the software which has created the signature.
-
-The contents of this string is not defined in detail; however each implementation creating container signatures:
-
-- SHOULD define the contents to unambiguously define the software in practice (e.g. it SHOULD contain the name of the software, not only the version number)
-- SHOULD use a build and versioning process which ensures that the contents of this string (e.g. an included version number)
-  changes whenever the format or semantics of the generated signature changes in any way;
-  it SHOULD not be possible for two implementations which use a different format or semantics to have the same `optional.creator` value
-- SHOULD use a format which is reasonably easy to parse in software (perhaps using a regexp),
-  and which makes it easy enough to recognize a range of versions of a specific implementation
-  (e.g. the version of the implementation SHOULD NOT be only a git hash, because they don’t have an easily defined ordering;
-  the string should contain a version number, or at least a date of the commit).
-
-Consumers of container signatures MAY recognize specific values or sets of values of `optional.creator`
-(perhaps augmented with `optional.timestamp`),
-and MAY change their processing of the signature based on these values
-(usually to acommodate violations of this specification in past versions of the signing software which cannot be fixed retroactively),
-as long as the semantics of the invalid document, as created by such an implementation, is clear.
-
-If consumers of signatures do change their behavior based on the `optional.creator` value,
-they SHOULD take care that the way they process the signatures is not inconsistent with
-strictly validating signature consumers.
-(I.e. it is acceptable for a consumer to accept a signature based on a specific `optional.creator` value
-if other implementations would completely reject the signature,
-but it would be very undesirable for the two kinds of implementations to accept the signature in different
-and inconsistent situations.)
-
-### `optional.timestamp`
-
-If present, this MUST be a JSON number, which is representable as a 64-bit integer, and identifies the time when the signature was created
-as the number of seconds since the UNIX epoch (Jan 1 1970 00:00 UTC).

SOURCES/containers-storage.conf.5.md

@@ -1,16 +1,16 @@
-% containers-storage.conf(5) Container Storage Configuration File
+% storage.conf(5) Container Storage Configuration File
 % Dan Walsh
 % May 2017
 
 # NAME
 storage.conf - Syntax of Container Storage configuration file
 
-## DESCRIPTION
+# DESCRIPTION
 The STORAGE configuration file specifies all of the available container storage options
 for tools using shared container storage, but in a TOML format that can be more easily modified
 and versioned.
 
-## FORMAT
+# FORMAT
 The [TOML format][toml] is used as the encoding of the configuration file.
 Every option and subtable listed here is nested under a global "storage" table.
 No bare options are used. The format of TOML can be simplified to:
@@ -28,12 +28,6 @@ No bare options are used. The format of TOML can be simplified to:
 
 The `storage` table supports the following options:
 
-**driver**=""
-  container storage driver (default: "overlay")
-  Default Copy On Write (COW) container storage driver
-  Valid drivers are "overlay", "vfs", "devmapper", "aufs", "btrfs", and "zfs"
-  Some drivers (for example, "zfs", "btrfs", and "aufs") may not work if your kernel lacks support for the filesystem
-
 **graphroot**=""
   container storage graph dir (default: "/var/lib/containers/storage")
   Default directory to store all writable content created by container storage programs
@@ -42,6 +36,10 @@ The `storage` table supports the following options:
   container storage run dir (default: "/var/run/containers/storage")
   Default directory to store all temporary writable content created by container storage programs
 
+**driver**=""
+  container storage driver (default is "overlay")
+  Default Copy On Write (COW) container storage driver
+
 ### STORAGE OPTIONS TABLE 
 
 The `storage.options` table supports the following options:
@@ -49,94 +47,54 @@ The `storage.options` table supports the following options:
 **additionalimagestores**=[]
   Paths to additional container image stores. Usually these are read/only and stored on remote network shares.
 
-**mount_program**=""
-  Specifies the path to a custom program to use instead of using kernel defaults for mounting the file system.
-
-      mount_program = "/usr/bin/fuse-overlayfs"
-
-**mountopt**=""
-
-  Comma separated list of default options to be used to mount container images.  Suggested value "nodev".
-
-**ostree_repo** = ""
-   If specified, use OSTree to deduplicate files with the overlay or vfs backends.
-
 **size**=""
-  Maximum size of a container image.   This flag can be used to set quota on the size of container images. (default: 10GB)
+  Maximum size of a container image.  Default is 10GB.  This flag can be used to set quota
+  on the size of container images.
 
-**skip_mount_home** = "false"
-   Set to skip a PRIVATE bind mount on the storage home directory.
-Only supported by certain container storage drivers (overlay).
+**override_kernel_check**=""
+  Tell storage drivers to ignore kernel version checks.  Some storage drivers assume that if a kernel is too
+  old, the driver is not supported.  But for kernels that have had the drivers backported, this flag
+  allows users to override the checks
 
-**remap-uids=**""
-**remap-gids=**""
+[storage.options.thinpool]
 
-  Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of
-a container, to the UIDs/GIDs outside of the container, and the length of the
-range of UIDs/GIDs.  Additional mapped sets can be listed and will be heeded by
-libraries, but there are limits to the number of mappings which the kernel will
-allow when you later attempt to run a container.
-
-     Example
-     remap-uids = 0:1668442479:65536
-     remap-gids = 0:1668442479:65536
-
-     These mappings tell the container engines to map UID 0 inside of the
-     container to UID 1668442479 outside.  UID 1 will be mapped to 1668442480.
-     UID 2 will be mapped to 1668442481, etc, for the next 65533 UIDs in
-     Succession.
-
-**remap-user**=""
-**remap-group**=""
-
-  Remap-User/Group is a user name which can be used to look up one or more UID/GID
-ranges in the /etc/subuid or /etc/subgid file.  Mappings are set up starting
-with an in-container ID of 0 and then a host-level ID taken from the lowest
-range that matches the specified name, and using the length of that range.
-Additional ranges are then assigned, using the ranges which specify the
-lowest host-level IDs first, to the lowest not-yet-mapped in-container ID,
-until all of the entries have been used for maps.
-
-      remap-user = "storage"
-      remap-group = "storage"
-
-### STORAGE OPTIONS FOR THINPOOL TABLE
+Storage Options for thinpool
 
 The `storage.options.thinpool` table supports the following options:
 
 **autoextend_percent**=""
 
-Tells the thinpool driver the amount by which the thinpool needs to be grown. This is specified in terms of % of pool size. So a value of 20 means that when threshold is hit, pool will be grown by 20% of existing pool size. (default: 20%)
+Tells the thinpool driver the amount by which the thinpool needs to be grown. This is specified in terms of % of pool size. So a value of 20 means that when threshold is hit, pool will be grown by 20% of existing pool size. (Default is 20%)
 
 **autoextend_threshold**=""
 
-Tells the driver the thinpool extension threshold in terms of percentage of pool size. For example, if threshold is 60, that means when pool is 60% full, threshold has been hit. (default: 80%)
+Tells the driver the thinpool extension threshold in terms of percentage of pool size. For example, if threshold is 60, that means when pool is 60% full, threshold has been hit. (80% is the default)
 
 **basesize**=""
 
-Specifies the size to use when creating the base device, which limits the size of images and containers. (default: 10g)
+Specifies the size to use when creating the base device, which limits the size of images and containers. (10g is the default)
 
 **blocksize**=""
 
-Specifies a custom blocksize to use for the thin pool. (default: 64k)
+Specifies a custom blocksize to use for the thin pool. (64k is the default)
 
 **directlvm_device**=""
 
-Specifies a custom block storage device to use for the thin pool. Required for using graphdriver `devicemapper`.
+Specifies a custom block storage device to use for the thin pool. Required if you setup devicemapper
 
 **directlvm_device_force**=""
 
-Tells driver to wipe device (directlvm_device) even if device already has a filesystem.  (default: false)
+Tells driver to wipe device (directlvm_device) even if device already has a filesystem.  Default is False
 
 **fs**="xfs"
 
-Specifies the filesystem type to use for the base device. (default: xfs)
+Specifies the filesystem type to use for the base device. (Default is xfs)
 
 **log_level**=""
 
 Sets the log level of devicemapper.
 
-    0: LogLevelSuppress 0 (default)
+    0: LogLevelSuppress 0 (Default)
     2: LogLevelFatal
     3: LogLevelErr
     4: LogLevelWarn
@@ -146,51 +104,28 @@ Sets the log level of devicemapper.
 
 **min_free_space**=""
 
-Specifies the min free space percent in a thin pool required for new device creation to succeed. Valid values are from 0% - 99%. Value 0% disables. (default: 10%)
+Specifies the min free space percent in a thin pool require for new device creation to succeed. Valid values are from 0% - 99%. Value 0% disables (10% is the default)
 
 **mkfsarg**=""
 
 Specifies extra mkfs arguments to be used when creating the base device.
 
-**use_deferred_deletion**=""
+**mountopt**=""
 
-Marks thinpool device for deferred deletion. If the thinpool is in use when the driver attempts to delete it, the driver will attempt to delete device every 30 seconds until successful, or when it restarts.  Deferred deletion permanently deletes the device and all data stored in the device will be lost. (default: true).
+Specifies extra mount options used when mounting the thin devices.
 
 **use_deferred_removal**=""
 
-Marks devicemapper block device for deferred removal.  If the device is in use when its driver attempts to remove it, the driver tells the kernel to remove the device as soon as possible.  Note this does not free up the disk space, use deferred deletion to fully remove the thinpool.  (default: true).
+Marks device for deferred removal.  If the device is in use when it driver attempts to remove it, driver will tell the kernel to remove it as soon as possible.  (Default is true).
+
+**use_deferred_deletion**=""
+
+Marks device for deferred deletion. If the device is in use when it driver attempts to delete it, driver continue to attempt to delete device every 30 seconds, or when it restarts.  (Default is true).
 
 **xfs_nospace_max_retries**=""
 
-Specifies the maximum number of retries XFS should attempt to complete IO when ENOSPC (no space) error is returned by underlying storage device. (default: 0, which means to try continuously.)
+Specifies the maximum number of retries XFS should attempt to complete IO when ENOSPC (no space) error is returned by underlying storage device. (Default is 0, which means to try continuously.
 
-## SELINUX LABELING
-
-When running on an SELinux system, if you move the containers storage graphroot directory, you must make sure the labeling is correct.
-
-Tell SELinux about the new containers storage by setting up an equivalence record.
-This tells SELinux to label content under the new path, as if it was stored
-under `/var/lib/containers/storage`.
-
-```
-semanage fcontext -a -e /var/lib/containers NEWSTORAGEPATH
-restorecon -R -v /src/containers
-```
-
-The semanage command above tells SELinux to setup the default labeling of
-`NEWSTORAGEPATH` to match `/var/lib/containers`.  The `restorecon` command
-tells SELinux to apply the labels to the actual content.
-
-Now all new content created in these directories will automatically be created
-with the correct label.
-
-## SEE ALSO
-`semanage(8)`, `restorecon(8)`
-
-## FILES
-
-Distributions often provide a /usr/share/containers/storage.conf file to define default storage configuration. Administrators can override this file by creating `/etc/containers/storage.conf` to specify their own configuration. The storage.conf file for rootless users is stored in the $HOME/.config/containers/storage.conf file.
-
-## HISTORY
+# HISTORY
 May 2017, Originally compiled by Dan Walsh <dwalsh@redhat.com>
 Format copied from crio.conf man page created by Aleksa Sarai <asarai@suse.de>

SOURCES/containers-transports.5.md

@@ -1,109 +0,0 @@
-% CONTAINERS-TRANSPORTS(5) Containers Transports Man Page
-% Valentin Rothberg
-% April 2019
-
-## NAME
-
-containers-transports - description of supported transports for copying and storing container images
-
-## DESCRIPTION
-
-Tools which use the containers/image library, including skopeo(1), buildah(1), podman(1), all share a common syntax for referring to container images in various locations.
-The general form of the syntax is _transport:details_, where details are dependent on the specified transport, which are documented below.
-
-### **containers-storage:** [storage-specifier]{image-id|docker-reference[@image-id]}
-
-An image located in a local containers storage.
-The format of _docker-reference_ is described in detail in the **docker** transport.
-
-The _storage-specifier_ allows for referencing storage locations on the file system and has the format `[[driver@]root[+run-root][:options]]` where the optional `driver` refers to the storage driver (e.g., overlay or btrfs) and where `root` is an absolute path to the storage's root directory.
-The optional `run-root` can be used to specify the run directory of the storage where all temporary writable content is stored.
-The optional `options` are a comma-separated list of driver-specific options.
-Please refer to containers-storage.conf(5) for further information on the drivers and supported options.
-
-### **dir:**_path_
-
-An existing local directory _path_ storing the manifest, layer tarballs and signatures as individual files.
-This is a non-standardized format, primarily useful for debugging or noninvasive container inspection.
-
-### **docker://**_docker-reference_
-
-An image in a registry implementing the "Docker Registry HTTP API V2".
-By default, uses the authorization state in `$XDG_RUNTIME_DIR/containers/auth.json`, which is set using podman-login(1).
-If the authorization state is not found there, `$HOME/.docker/config.json` is checked, which is set using docker-login(1).
-The containers-registries.conf(5) further allows for configuring various settings of a registry.
-
-Note that a _docker-reference_ has the following format: `name[:tag|@digest]`.
-While the docker transport does not support both a tag and a digest at the same time some formats like containers-storage do.
-Digests can also be used in an image destination as long as the manifest matches the provided digest.
-The digest of images can be explored with skopeo-inspect(1).
-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]_
-
-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.
-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_
-
-An image stored in the docker daemon's internal storage.
-The image must be specified as a _docker-reference_ or in an alternative _algo:digest_ format when being used as an image source.
-The _algo:digest_ refers to the image ID reported by docker-inspect(1).
-
-### **oci:**_path[:tag]_
-
-An image compliant with the "Open Container Image Layout Specification" at _path_.
-Using a _tag_ is optional and allows for storing multiple images at the same _path_.
-
-### **oci-archive:**_path[:tag]_
-
-An image compliant with the "Open Container Image Layout Specification" stored as a tar(1) archive at _path_.
-
-### **ostree:**_docker-reference[@/absolute/repo/path]_
-
-An image in the local ostree(1) repository.
-_/absolute/repo/path_ defaults to _/ostree/repo_.
-
-## Examples
-
-The following examples demonstrate how some of the containers transports can be used.
-The examples use skopeo-copy(1) for copying container images.
-
-**Copying an image from one registry to another**:
-```
-$ skopeo copy docker://docker.io/library/alpine:latest docker://localhost:5000/alpine:latest
-```
-
-**Copying an image from a running Docker daemon to a directory in the OCI layout**:
-```
-$ mkdir alpine-oci
-$ skopeo copy docker-daemon:alpine:latest oci:alpine-oci
-$ tree alpine-oci
-test-oci/
-├── blobs
-│   └── sha256
-│       ├── 83ef92b73cf4595aa7fe214ec6747228283d585f373d8f6bc08d66bebab531b7
-│       ├── 9a6259e911dcd0a53535a25a9760ad8f2eded3528e0ad5604c4488624795cecc
-│       └── ff8df268d29ccbe81cdf0a173076dcfbbea4bb2b6df1dd26766a73cb7b4ae6f7
-├── index.json
-└── oci-layout
-
-2 directories, 5 files
-```
-
-**Copying an image from a registry to the local storage**:
-```
-$ skopeo copy docker://docker.io/library/alpine:latest containers-storage:alpine:latest
-```
-
-## SEE ALSO
-
-docker-login(1), docker-save(1), ostree(1), podman-login(1), skopeo-copy(1), skopeo-inspect(1), tar(1), container-registries.conf(5), containers-storage.conf(5)
-
-## AUTHORS
-
-Miloslav Trmač <mitr@redhat.com>
-Valentin Rothberg <rothberg@redhat.com>

SOURCES/policy.json.5.md

@@ -1,9 +1,9 @@
-% CONTAINERS-POLICY.JSON(5) policy.json Man Page
+% POLICY.JSON(5) policy.json Man Page
 % Miloslav Trmač
 % September 2016
 
 # NAME
-containers-policy.json - syntax for the signature verification policy file
+policy.json - Syntax for the Signature Verification Configuration File
 
 ## DESCRIPTION
 
@@ -274,10 +274,8 @@ selectively allow individual transports and scopes as desired.
     "default": [{"type": "insecureAcceptAnything"}]
 }
 ```
-## SEE ALSO
+# SEE ALSO
   atomic(1)
 
-## HISTORY
-August 2018, Rename to containers-policy.json(5) by Valentin Rothberg <vrothberg@suse.com>
-
+# HISTORY
 September 2016, Originally compiled by Miloslav Trmač <mitr@redhat.com>

SOURCES/registries.conf

@@ -1,113 +1,25 @@
-# For more information on this configuration file, see containers-registries.conf(5).
-#
-# There are multiple versions of the configuration syntax available, where the
-# second iteration is backwards compatible to the first one. Mixing up both
-# formats will result in an runtime error.
-#
-# The initial configuration format looks like this:
-#
-# NOTE: RISK OF USING UNQUALIFIED IMAGE NAMES
-# Red Hat recommends always using fully qualified image names including the registry server (full dns name),
-# namespace, image name, and tag (ex. registry.redhat.io/ubi8/ubu:latest). When using short names, there is
-# always an inherent risk that the image being pulled could be spoofed. For example, a user wants to.
-# pull an image named `foobar` from a registry and expects it to come from myregistry.com. If myregistry.com
-# is not first in the search list, an attacker could place a different `foobar` image at a registry earlier
-# in the search list. The user would accidentally pull and run the attacker's image and code rather than the
-# intended content. Red Hat recommends only adding registries which are completely trusted, i.e. registries
-# which don't allow unknown or anonymous users to create accounts with arbitrary names. This will prevent
-# an image from being spoofed, squatted or otherwise made insecure.  If it is necessary to use one of these
-# registries, it should be added at the end of the list.
-#
-# It is recommended to use fully-qualified images for pulling as the
-# destination registry is unambiguous. Pulling by digest
-# (i.e., quay.io/repository/name@digest) further eliminates the ambiguity of
-# tags.
+# This is a system-wide configuration file used to
+# keep track of registries for various container backends.
+# It adheres to TOML format and does not support recursive
+# lists of registries.
 
-# The following registries are a set of secure defaults provided by Red Hat.
-# Each of these registries provides container images curated, patched
-# and maintained by Red Hat and its partners
-#[registries.search]
-#registries = ['registry.access.redhat.com', 'registry.redhat.io']
+# The default location for this configuration file is /etc/containers/registries.conf.
+
+# The only valid categories are: 'registries.search', 'registries.insecure', 
+# and 'registries.block'.
 
-# To ensure compatibility with docker we've included docker.io in the default search list. However Red Hat
-# does not curate, patch or maintain container images from the docker.io registry.
 [registries.search]
-registries = ['registry.access.redhat.com', 'registry.redhat.io', 'docker.io']
+registries = ['registry.redhat.io', 'quay.io', 'docker.io']
 
-# The following registries entry can be used for convenience but includes
-# container images built by the community. This set of content comes with all
-# of the risks of any user generated content including security and performance
-# issues. To use this list first comment out the default list, then uncomment
-# the following list
-#[registries.search]
-#registries = ['registry.access.redhat.com', 'registry.redhat.io', 'docker.io', 'quay.io']
-
-# Registries that do not use TLS when pulling images or uses self-signed
-# certificates.
+# If you need to access insecure registries, add the registry's fully-qualified name.
+# An insecure registry is one that does not have a valid SSL certificate or only does HTTP.
 [registries.insecure]
 registries = []
 
-# Blocked Registries, blocks the `docker daemon` from pulling from the blocked registry.  If you specify
-# "*", then the docker daemon will only be allowed to pull from registries listed above in the search
-# registries.  Blocked Registries is deprecated because other container runtimes and tools will not use it.
-# It is recommended that you use the trust policy file /etc/containers/policy.json to control which
-# registries you want to allow users to pull and push from.  policy.json gives greater flexibility, and
-# supports all container runtimes and tools including the docker daemon, cri-o, buildah ...
-# The atomic CLI `atomic trust` can be used to easily configure the policy.json file.
+
+# If you need to block pull access from a registry, uncomment the section below
+# and add the registries fully-qualified name.
+#
+# Docker only
 [registries.block]
 registries = []
-
-# The second version of the configuration format allows to specify registry
-# mirrors:
-#
-# # An array of host[:port] registries to try when pulling an unqualified image, in order.
-# unqualified-search-registries = ["example.com"]
-#
-# [[registry]]
-# # The "prefix" field is used to choose the relevant [[registry]] TOML table;
-# # (only) the TOML table with the longest match for the input image name
-# # (taking into account namespace/repo/tag/digest separators) is used.
-# #
-# # If the prefix field is missing, it defaults to be the same as the "location" field.
-# prefix = "example.com/foo"
-#
-# # If true, unencrypted HTTP as well as TLS connections with untrusted
-# # certificates are allowed.
-# insecure = false
-#
-# # If true, pulling images with matching names is forbidden.
-# blocked = false
-#
-# # The physical location of the "prefix"-rooted namespace.
-# #
-# # By default, this equal to "prefix" (in which case "prefix" can be omitted
-# # and the [[registry]] TOML table can only specify "location").
-# #
-# # Example: Given
-# #   prefix = "example.com/foo"
-# #   location = "internal-registry-for-example.net/bar"
-# # requests for the image example.com/foo/myimage:latest will actually work with the
-# # internal-registry-for-example.net/bar/myimage:latest image.
-# location = internal-registry-for-example.com/bar"
-#
-# # (Possibly-partial) mirrors for the "prefix"-rooted namespace.
-# #
-# # The mirrors are attempted in the specified order; the first one that can be
-# # contacted and contains the image will be used (and if none of the mirrors contains the image,
-# # the primary location specified by the "registry.location" field, or using the unmodified
-# # user-specified reference, is tried last).
-# #
-# # Each TOML table in the "mirror" array can contain the following fields, with the same semantics
-# # as if specified in the [[registry]] TOML table directly:
-# # - location
-# # - insecure
-# [[registry.mirror]]
-# location = "example-mirror-0.local/mirror-for-foo"
-# [[registry.mirror]]
-# location = "example-mirror-1.local/mirrors/foo"
-# insecure = true
-# # Given the above, a pull of example.com/foo/image:latest will try:
-# # 1. example-mirror-0.local/mirror-for-foo/image:latest
-# # 2. example-mirror-1.local/mirrors/foo/image:latest
-# # 3. internal-registry-for-example.net/bar/myimage:latest
-# # in order, and use the first one that exists.

SOURCES/registries.conf.5.md

@@ -0,0 +1,41 @@
+% registries.conf(5) System-wide registry configuration file
+% Brent Baude
+% Aug 2017
+
+# NAME
+registries.conf - Syntax of System Registry Configuration File
+
+# DESCRIPTION
+The REGISTRIES configuration file is a system-wide configuration file for container image
+registries. The file format is TOML.
+
+# FORMAT
+The TOML_format is used to build simple list format for registries under two
+categories: `search` and `insecure`. You can list multiple registries using
+as a comma separated list.
+
+Search registries are used when the caller of a container runtime does not fully specify the
+container image that they want to execute.  These registries are prepended onto the front
+ of the specified container image until the named image is found at a registry.
+
+Insecure Registries.  By default container runtimes use TLS when retrieving images
+from a registry.  If the registry is not setup with TLS, then the container runtime
+will fail to pull images from the registry. If you add the registry to the list of
+insecure registries then the container runtime will attempt use standard web protocols to
+pull the image.  It also allows you to pull from a registry with self-signed certificates.
+Note insecure registries can be used for any registry, not just the
+registries listed under search.
+
+The following example configuration defines two searchable registries and one
+insecure registry.
+
+```
+[registries.search]
+registries = ["registry1.com", "registry2.com"]
+
+[registries.insecure]
+registries = ["registry3.com"]
+```
+
+# HISTORY
+Aug 2017, Originally compiled by Brent Baude <bbaude@redhat.com>

SOURCES/skopeo-test-fix.patch

@@ -1,35 +0,0 @@
-diff --git a/systemtest/010-inspect.bats b/systemtest/010-inspect.bats
-index 26d8364..dea2c7d 100644
---- a/systemtest/010-inspect.bats
-+++ b/systemtest/010-inspect.bats
-@@ -107,7 +107,7 @@ END_EXPECT
-         remote_image=docker://docker.io/$arch/golang
-         run_skopeo inspect --tls-verify=false --raw $remote_image
-         remote=$(echo "$output" | jq -r '.manifests[0]["platform"]')
--        expect=$(echo "{\"architecture\":\"$arch\",\"os\":\"linux\"}" | jq)
-+        expect=$(echo "{\"architecture\":\"$arch\",\"os\":\"linux\"}" | jq .)
-         expect_output --from="$remote" --substring "$expect" \
-                   "platform arch is not expected"
-     done
-diff --git a/systemtest/helpers.bash b/systemtest/helpers.bash
-index 5e69d0d..765286a 100644
---- a/systemtest/helpers.bash
-+++ b/systemtest/helpers.bash
-@@ -299,7 +299,7 @@ start_registry() {
-         fi
- 
-         if ! egrep -q "^$testuser:" $AUTHDIR/htpasswd; then
--            log_and_run $PODMAN run --rm --entrypoint htpasswd registry:2 \
-+            log_and_run $PODMAN run --rm --entrypoint htpasswd registry:2.6 \
-                    -Bbn $testuser $testpassword >> $AUTHDIR/htpasswd
-         fi
- 
-@@ -332,7 +332,7 @@ start_registry() {
-         log_and_run cp $CERT $TESTDIR/client-auth/
-     fi
- 
--    log_and_run $PODMAN run -d --name $name "${reg_args[@]}" registry:2
-+    log_and_run $PODMAN run -d --name $name "${reg_args[@]}" registry:2.6
- 
-     # Wait for registry to actually come up
-     timeout=10

SOURCES/storage.conf

@@ -1,5 +1,5 @@
-# This file is is the configuration file for all tools
-# that use the containers/storage library.
+# storage.conf is the configuration file for all tools
+# that share the containers/storage libraries
 # See man 5 containers-storage.conf for more information
 # The "container storage" table contains all of the server options.
 [storage]
@@ -25,16 +25,9 @@ additionalimagestores = [
 # certain container storage drivers.
 size = ""
 
-# Path to an helper program to use for mounting the file system instead of mounting it
-# directly.
-#mount_program = "/usr/bin/fuse-overlayfs"
-
 # OverrideKernelCheck tells the driver to ignore kernel checks based on kernel version
 override_kernel_check = "true"
 
-# mountopt specifies comma separated list of extra mount options
-# mountopt = "nodev,metacopy=on"
-
 # Remap-UIDs/GIDs is the mapping from UIDs/GIDs as they should appear inside of
 # a container, to UIDs/GIDs as they should appear outside of the container, and
 # the length of the range of UIDs/GIDs.  Additional mapped sets can be listed
@@ -78,10 +71,10 @@ override_kernel_check = "true"
 # blocksize="64k"
 
 # directlvm_device specifies a custom block storage device to use for the
-# thin pool. Required if you setup devicemapper.
+# thin pool. Required if you setup devicemapper
 # directlvm_device = ""
 
-# directlvm_device_force wipes device even if device already has a filesystem.
+# directlvm_device_force wipes device even if device already has a filesystem
 # directlvm_device_force = "True"
 
 # fs specifies the filesystem type to use for the base device.
@@ -102,32 +95,20 @@ override_kernel_check = "true"
 # Value 0% disables
 # min_free_space = "10%"
 
-# mkfsarg specifies extra mkfs arguments to be used when creating the base.
+# mkfsarg specifies extra mkfs arguments to be used when creating the base
 # device.
 # mkfsarg = ""
 
-# use_deferred_removal marks devicemapper block device for deferred removal.
-# If the thinpool is in use when the driver attempts to remove it, the driver 
-# tells the kernel to remove it as soon as possible. Note this does not free
-# up the disk space, use deferred deletion to fully remove the thinpool.
+# mountopt specifies extra mount options used when mounting the thin devices.
+# mountopt = ""
+
+# use_deferred_removal Marking device for deferred removal
 # use_deferred_removal = "True"
 
-# use_deferred_deletion marks thinpool device for deferred deletion.
-# If the device is busy when the driver attempts to delete it, the driver
-# will attempt to delete device every 30 seconds until successful.
-# If the program using the driver exits, the driver will continue attempting
-# to cleanup the next time the driver is used. Deferred deletion permanently
-# deletes the device and all data stored in device will be lost.
+# use_deferred_deletion Marking device for deferred deletion
 # use_deferred_deletion = "True"
 
 # xfs_nospace_max_retries specifies the maximum number of retries XFS should
 # attempt to complete IO when ENOSPC (no space) error is returned by
 # underlying storage device.
 # xfs_nospace_max_retries = "0"
-
-# If specified, use OSTree to deduplicate files with the overlay backend
-ostree_repo = ""
-
-# Set to skip a PRIVATE bind mount on the storage home directory.  Only supported by
-# certain container storage drivers
-skip_mount_home = "false"

SPECS/skopeo.spec

@@ -10,8 +10,8 @@
 
 %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 %{?**};
-%endif
+go build -buildmode pie -compiler gc -tags="rpm_crashtraceback no_openssl ${BUILDTAGS:-}" -ldflags "${LDFLAGS:-} -compressdwarf=false -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**};
+%endif # distro
 
 %global provider github
 %global provider_tld com
@@ -21,108 +21,39 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path %{provider_prefix}
 %global git0 https://%{import_path}
-%global commit0 7d080caaa32327ca063276f477a64af0fd4617ba
+%global commit0 1715c9084124875cb71f006916396e3c7d03014e
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
-# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
 # manually listed arches due https://bugzilla.redhat.com/show_bug.cgi?id=1391932 (removed ppc64)
-ExcludeArch: ppc64
+# remove ix86 temporarily because go-toolset issues
+ExcludeArch: ppc64 %{ix86}
 
-Epoch: 1
 Name: %{repo}
-Version: 0.1.41
-Release: 4%{?dist}
-Summary: Inspect container images and repositories on registries
+Epoch: 1
+Version: 0.1.32
+Release: 6.git%{shortcommit0}%{?dist}
+Summary: Inspect Docker 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/%{commit0}/%{name}-%{shortcommit0}.tar.gz
 Source1: storage.conf
 Source2: containers-storage.conf.5.md
 Source3: mounts.conf
-Source4: containers-registries.conf.5.md
+Source4: registries.conf.5.md
 Source5: registries.conf
-Source6: containers-policy.json.5.md
+Source6: policy.json.5.md
 Source7: seccomp.json
-Source8: containers-mounts.conf.5.md
-Source9: containers-signature.5.md
-Source10: containers-transports.5.md
-Source11: containers-certs.d.5.md
-Source12: containers-registries.d.5.md
-Patch0: skopeo-test-fix.patch
-
 BuildRequires: git
-BuildRequires: golang >= 1.12.12-4
-BuildRequires: go-md2man
+# If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
+BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
+BuildRequires: golang-github-cpuguy83-go-md2man
 BuildRequires: gpgme-devel
 BuildRequires: libassuan-devel
 BuildRequires: pkgconfig(devmapper)
 BuildRequires: ostree-devel
 BuildRequires: glib2-devel
-BuildRequires: make
 Requires: containers-common = %{epoch}:%{version}-%{release}
 
-Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-Provides: bundled(golang(github.com/BurntSushi/toml)) = master
-Provides: bundled(golang(github.com/containerd/continuity)) = d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371
-Provides: bundled(golang(github.com/containers/image)) = master
-Provides: bundled(golang(github.com/containers/storage)) = master
-Provides: bundled(golang(github.com/davecgh/go-spew)) = master
-Provides: bundled(golang(github.com/docker/distribution)) = master
-Provides: bundled(golang(github.com/docker/docker-credential-helpers)) = d68f9aeca33f5fd3f08eeae5e9d175edf4e731d1
-Provides: bundled(golang(github.com/docker/docker)) = da99009bbb1165d1ac5688b5c81d2f589d418341
-Provides: bundled(golang(github.com/docker/go-connections)) = 7beb39f0b969b075d1325fecb092faf27fd357b6
-Provides: bundled(golang(github.com/docker/go-metrics)) = 399ea8c73916000c64c2c76e8da00ca82f8387ab
-Provides: bundled(golang(github.com/docker/go-units)) = 8a7beacffa3009a9ac66bad506b18ffdd110cf97
-Provides: bundled(golang(github.com/docker/libtrust)) = master
-Provides: bundled(golang(github.com/ghodss/yaml)) = 73d445a93680fa1a78ae23a5839bad48f32ba1ee
-Provides: bundled(golang(github.com/go-check/check)) = v1
-Provides: bundled(golang(github.com/gogo/protobuf)) = fcdc5011193ff531a548e9b0301828d5a5b97fd8
-Provides: bundled(golang(github.com/golang/glog)) = 44145f04b68cf362d9c4df2182967c2275eaefed
-Provides: bundled(golang(github.com/golang/protobuf)) = 8d92cf5fc15a4382f8964b08e1f42a75c0591aa3
-Provides: bundled(golang(github.com/gorilla/context)) = 14f550f51a
-Provides: bundled(golang(github.com/gorilla/mux)) = e444e69cbd
-Provides: bundled(golang(github.com/imdario/mergo)) = 6633656539c1639d9d78127b7d47c622b5d7b6dc
-Provides: bundled(golang(github.com/kr/pretty)) = v0.1.0
-Provides: bundled(golang(github.com/kr/text)) = v0.1.0
-Provides: bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = c12348ce28de40eed0136aa2b644d0ee0650e56c
-Provides: bundled(golang(github.com/mistifyio/go-zfs)) = 22c9b32c84eb0d0c6f4043b6e90fc94073de92fa
-Provides: bundled(golang(github.com/mtrmac/gpgme)) = master
-Provides: bundled(golang(github.com/opencontainers/go-digest)) = master
-Provides: bundled(golang(github.com/opencontainers/image-spec)) = 149252121d044fddff670adcdc67f33148e16226
-Provides: bundled(golang(github.com/opencontainers/image-tools)) = 6d941547fa1df31900990b3fb47ec2468c9c6469
-Provides: bundled(golang(github.com/opencontainers/runc)) = master
-Provides: bundled(golang(github.com/opencontainers/runtime-spec)) = v1.0.0
-Provides: bundled(golang(github.com/opencontainers/selinux)) = master
-Provides: bundled(golang(github.com/ostreedev/ostree-go)) = aeb02c6b6aa2889db3ef62f7855650755befd460
-Provides: bundled(golang(github.com/pborman/uuid)) = v1.0
-Provides: bundled(golang(github.com/pkg/errors)) = master
-Provides: bundled(golang(github.com/pmezard/go-difflib)) = master
-Provides: bundled(golang(github.com/pquerna/ffjson)) = d49c2bc1aa135aad0c6f4fc2056623ec78f5d5ac
-Provides: bundled(golang(github.com/prometheus/client_golang)) = c332b6f63c0658a65eca15c0e5247ded801cf564
-Provides: bundled(golang(github.com/prometheus/client_model)) = 99fa1f4be8e564e8a6b613da7fa6f46c9edafc6c
-Provides: bundled(golang(github.com/prometheus/common)) = 89604d197083d4781071d3c65855d24ecfb0a563
-Provides: bundled(golang(github.com/prometheus/procfs)) = cb4147076ac75738c9a7d279075a253c0cc5acbd
-Provides: bundled(golang(github.com/sirupsen/logrus)) = v1.0.0
-Provides: bundled(golang(github.com/stretchr/testify)) = v1.1.3
-Provides: bundled(golang(github.com/syndtr/gocapability)) = master
-Provides: bundled(golang(github.com/tchap/go-patricia)) = v2.2.6
-Provides: bundled(golang(github.com/ulikunitz/xz)) = v0.5.4
-Provides: bundled(golang(github.com/urfave/cli)) = v1.17.0
-Provides: bundled(golang(github.com/vbatts/tar-split)) = v0.10.2
-Provides: bundled(golang(github.com/xeipuuv/gojsonpointer)) = master
-Provides: bundled(golang(github.com/xeipuuv/gojsonreference)) = master
-Provides: bundled(golang(github.com/xeipuuv/gojsonschema)) = master
-Provides: bundled(golang(go4.org)) = master
-Provides: bundled(golang(golang.org/x/crypto)) = master
-Provides: bundled(golang(golang.org/x/net)) = master
-Provides: bundled(golang(golang.org/x/sys)) = master
-Provides: bundled(golang(golang.org/x/text)) = master
-Provides: bundled(golang(gopkg.in/cheggaaa/pb.v1)) = ad4efe000aa550bb54918c06ebbadc0ff17687b9
-Provides: bundled(golang(gopkg.in/yaml.v2)) = d466437aa4adc35830964cffc5b5f262c63ddcb4
-Provides: bundled(golang(k8s.io/client-go)) = master
-
 %description
 Command line utility to inspect images and repositories directly on Docker
 registries without the need to pull them
@@ -136,25 +67,11 @@ Provides: %{name}-containers = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-containers <= 1:0.1.31-3
 Recommends: fuse-overlayfs
 Recommends: slirp4netns
-Recommends: subscription-manager
 
 %description -n containers-common
 This package installs a default signature store configuration and a default
 policy under `/etc/containers/`.
 
-%package tests
-Summary:         Tests for %{name}
-Requires: %{name} = %{epoch}:%{version}-%{release}
-#Requires: bats  (which RHEL8 doesn't have. If it ever does, un-comment this)
-Requires: gnupg
-Requires: jq
-Requires: podman
-
-%description tests
-%{summary}
-
-This package contains system tests for %{name}
-
 %prep
 %autosetup -Sgit -n %{name}-%{commit0}
 
@@ -166,54 +83,40 @@ mkdir -p vendor/src
 for v in vendor/*; do
     if test ${v} = vendor/src; then continue; fi
     if test -d ${v}; then
-      mv ${v} vendor/src/
+	mv ${v} vendor/src/
     fi
 done
 
 export GOPATH=$(pwd):$(pwd)/vendor:%{gopath}
-export GO111MODULE=off
-export BUILDTAGS="exclude_graphdriver_btrfs btrfs_noversion $(hack/libdm_tag.sh) $(hack/ostree_tag.sh)"
+#make BUILDTAGS='exclude_graphdriver_btrfs' binary-local docs
+export BUILDTAGS="exclude_graphdriver_btrfs"
 %gobuild -o %{name} ./cmd/%{name}
-%{__make} docs
+make docs
 
 %install
-make \
-   DESTDIR=%{buildroot} \
-   SIGSTOREDIR=%{buildroot}%{_sharedstatedir}/containers/sigstore \
-   install
+make DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}%{_sysconfdir}
-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/
+mkdir -p %{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
-go-md2man -in %{SOURCE8} -out %{buildroot}%{_mandir}/man5/containers-mounts.conf.5
-go-md2man -in %{SOURCE9} -out %{buildroot}%{_mandir}/man5/containers-signature.5
-go-md2man -in %{SOURCE10} -out %{buildroot}%{_mandir}/man5/containers-transports.5
-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 %{SOURCE4} -out %{buildroot}%{_mandir}/man5/registries.conf.5
+install -p -m 644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/
+go-md2man -in %{SOURCE6} -out %{buildroot}%{_mandir}/man5/policy.json.5
 
 mkdir -p %{buildroot}%{_datadir}/containers
 install -m0644 %{SOURCE3} %{buildroot}%{_datadir}/containers/mounts.conf
 install -m0644 %{SOURCE7} %{buildroot}%{_datadir}/containers/seccomp.json
 
 # install secrets patch directory
-install -d -p -m 755 %{buildroot}/%{_datadir}/rhel/secrets
+install -d -p -m 750 %{buildroot}/%{_datadir}/rhel/secrets
 # rhbz#1110876 - update symlinks for subscription management
 ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pki-entitlement
 ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
-ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/redhat.repo
-
-# system tests
-install -d -p %{buildroot}/%{_datadir}/%{name}/test/system
-cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/
+ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/rhel7.repo
 
 %check
 %if 0%{?with_check}
 export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
-
 %gotest %{import_path}/integration
 %endif
 
@@ -222,106 +125,38 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 
 %files -n containers-common
 %dir %{_sysconfdir}/containers
-%dir %{_sysconfdir}/containers/certs.d
 %dir %{_sysconfdir}/containers/registries.d
-%dir %{_sysconfdir}/containers/oci
-%dir %{_sysconfdir}/containers/oci/hooks.d
 %config(noreplace) %{_sysconfdir}/containers/policy.json
 %config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
 %config(noreplace) %{_sysconfdir}/containers/storage.conf 
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
-%dir %{_sharedstatedir}/containers/sigstore
+%dir %{_sharedstatedir}/atomic/sigstore
 %{_mandir}/man5/*
 %dir %{_datadir}/containers
 %{_datadir}/containers/mounts.conf
 %{_datadir}/containers/seccomp.json
 %dir %{_datadir}/rhel/secrets
-%{_datadir}/rhel/secrets/*
+%{_datadir}/rhel/secrets/etc-pki-entitlement
+%{_datadir}/rhel/secrets/rhel7.repo
+%{_datadir}/rhel/secrets/rhsm
 
 %files
 %license LICENSE
 %doc README.md
 %{_bindir}/%{name}
-%{_mandir}/man1/%{name}*
+%{_mandir}/man1/%{name}.1*
 %dir %{_datadir}/bash-completion
 %dir %{_datadir}/bash-completion/completions
 %{_datadir}/bash-completion/completions/%{name}
 
-%files tests
-%license LICENSE
-%{_datadir}/%{name}/test
-
 %changelog
-* Tue Jan 12 2021 Jindrich Novy <jnovy@redhat.com> - 1:0.1.41-4
-- add docker.io into the default registry list
-- Resolves: #1883324
-
-* Thu Jul 16 2020 Eduardo Santiago <santiago@redhat.com> - 1:0.1.41-3
-- patch broken gating tests: improper 'jq' usage, and use 'registry:2.6'
-  (instead of :2) to work around broken image pushed by docker
-
-* Thu Jul 16 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.41-2
-- exclude i686 arch
+* Fri Jun 26 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.32-6.git1715c90
+- bump release to preserve upgrade path
 - Related: #1821193
 
-* Mon Apr 06 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.41-1
-- update to 0.1.41
-- Related: #1821193
-
-* Fri Mar 06 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-8
-- modify registries.conf default configuration to be more secure by default
-- Resolves: #1810056
-
-* Mon Feb 17 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-7
-- Fix CVE-2020-1702.
-- Resolves: #1801928
-
-* Thu Jan 02 2020 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-6
-- change the search order of registries and remove quay.io (#1784267)
-
-* Wed Dec 11 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-5
-- compile in FIPS mode
-- Related: RHELPLAN-25139
-
-* Mon Dec 09 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-4
-- be sure to use golang >= 1.12.12-4
-- Related: RHELPLAN-25139
-
-* Fri Dec 06 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-3
-- fix file list
-- Related: RHELPLAN-25139
-
-* Wed Nov 20 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-2
-- comment out mountopt option in order to fix gating tests
-  see bug 1769769
-- Related: RHELPLAN-25139
-
-* Wed Nov 06 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.40-1
-- update to 0.1.40
-- Related: RHELPLAN-25139
-
-* Thu Sep 12 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.37-5
-- Fix CVE-2019-10214 (#1734651).
-
-* Thu Aug 15 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.37-4
-- fix permissions of rhel/secrets
-  Resolves: #1691543
-
-* Fri Jun 14 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.37-3
-- Resolves: #1719994 - add registry.access.redhat.com to registries.conf
-
-* Fri Jun 14 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.37-2
-- Resolves: #1721247 - enable fips mode
-
-* Fri Jun 14 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.37-1
-- Resolves: #1720654 - rebase to v0.1.37
-
-* Tue Jun  4 2019 Eduardo Santiago <santiago@redhat.com> - 1:0.1.36-1.git6307635
-- built upstream tag v0.1.36, including system tests
-
-* Tue Apr 30 2019 Lokesh Mandvekar <lsm5@redhat.com> - 1:0.1.32-4.git1715c90
-- Fixes @openshift/machine-config-operator#669
-- install /etc/containers/oci/hooks.d and /etc/containers/certs.d
+* Thu Nov 28 2019 Jindrich Novy <jnovy@redhat.com> - 1:0.1.32-4.git1715c90
+- rebuild because of CVE-2019-9512 and CVE-2019-9514
+- Resolves: #1772130, #1772135
 
 * Tue Dec 18 2018 Frantisek Kluknavsky <fkluknav@redhat.com> - 1:0.1.32-3.git1715c90
 - rebase