diff --git a/containers-common.spec b/containers-common.spec index 9075243..8550609 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -4,15 +4,15 @@ # pick the oldest version on c/image, c/common, c/storage vendored in # podman/skopeo/podman. %global skopeo_branch main -%global image_branch v5.29.0 -%global common_branch v0.57.0 +%global image_branch v5.29.2 +%global common_branch v0.57.3 %global storage_branch v1.51.0 %global shortnames_branch main Epoch: 2 Name: containers-common Version: 1 -Release: 60%{?dist} +Release: 61%{?dist} Summary: Common configuration and documentation for containers License: ASL 2.0 ExclusiveArch: %{go_arches} @@ -173,6 +173,10 @@ EOF %{_datadir}/rhel/secrets/* %changelog +* Thu Feb 08 2024 Jindrich Novy - 2:1-61 +- update vendored components +- Related: Jira:RHEL-2112 + * Tue Jan 02 2024 Jindrich Novy - 2:1-60 - Update vendored components - Related: Jira:RHEL-2112 diff --git a/containers-transports.5.md b/containers-transports.5.md index 8ec42fe..481bdb7 100644 --- a/containers-transports.5.md +++ b/containers-transports.5.md @@ -40,10 +40,13 @@ By default, uses the authorization state in `$XDG_RUNTIME_DIR/containers/auth.js 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]`. +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 docker transport supports pushing images without a tag or digest to a registry when the image name is suffixed with **@@unknown-digest@@**. The _name_**@@unknown-digest@@** reference format cannot be used with a reference that has a tag or 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`. diff --git a/update-vendored.sh b/update-vendored.sh index a48c923..d666611 100755 --- a/update-vendored.sh +++ b/update-vendored.sh @@ -23,6 +23,7 @@ for P in podman skopeo buildah; do else $PKG --release rhel-8 prep fi + rm -rf *SPECPARTS DIR=`ls -d -- */ | grep "$P"` grep github.com/containers/image $DIR/go.mod | cut -d\ -f2 | sed 's,-.*,,'>> /tmp/ver_image grep github.com/containers/common $DIR/go.mod | cut -d\ -f2 | sed 's,-.*,,' >> /tmp/ver_common