From 58a95db29d78618a25fe355b277615ae64a9c16d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20Trma=C4=8D?= Date: Tue, 14 Sep 2021 10:58:28 +0200 Subject: [PATCH 1/2] Fix documentation of oci: and oci-archive: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes confusion reported in https://github.com/containers/podman/issues/11553 . Signed-off-by: Miloslav Trmač --- docs/containers-transports.5.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/containers-transports.5.md b/docs/containers-transports.5.md index c87283fb8..c23d48747 100644 --- a/docs/containers-transports.5.md +++ b/docs/containers-transports.5.md @@ -57,12 +57,12 @@ 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]_ +### **oci:**_path[:reference]_ 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_. +Using a _reference_ is optional and allows for storing multiple images at the same _path_. -### **oci-archive:**_path[:tag]_ +### **oci-archive:**_path[:reference]_ An image compliant with the "Open Container Image Layout Specification" stored as a tar(1) archive at _path_. From f920b5c3097950ed8b6ef903d14755c73eed10c9 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 14 Sep 2021 11:36:30 -0400 Subject: [PATCH 2/2] Update VM Images + Drop prior-ubuntu references Mirror of changes from https://github.com/containers/skopeo/pull/1444 These images contain a workaround for: https://github.com/containers/podman/issues/11123 Prior-Ubuntu support is being dropped everywhere. Ref: https://github.com/containers/podman/issues/11070 https://github.com/containers/automation_images/pull/88 Signed-off-by: Chris Evich --- .cirrus.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 8809c3999..f5028ec40 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -35,20 +35,17 @@ env: FEDORA_NAME: "fedora-34" PRIOR_FEDORA_NAME: "fedora-33" UBUNTU_NAME: "ubuntu-2104" - PRIOR_UBUNTU_NAME: "ubuntu-2010" # Google-cloud VM Images - IMAGE_SUFFIX: "c6724387953967104" + IMAGE_SUFFIX: "c6431352024203264" FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}" PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}" UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}" - PRIOR_UBUNTU_CACHE_IMAGE_NAME: "prior-ubuntu-${IMAGE_SUFFIX}" # Container FQIN's (include bleeding-edge development-level container deps.) FEDORA_CONTAINER_FQIN: "quay.io/libpod/fedora_podman:${IMAGE_SUFFIX}" PRIOR_FEDORA_CONTAINER_FQIN: "quay.io/libpod/prior-fedora_podman:${IMAGE_SUFFIX}" UBUNTU_CONTAINER_FQIN: "quay.io/libpod/ubuntu_podman:${IMAGE_SUFFIX}" - PRIOR_UBUNTU_CONTAINER_FQIN: "quay.io/libpod/prior-ubuntu_podman:${IMAGE_SUFFIX}" # Built along with the standard PR-based workflow in c/automation_images SKOPEO_CIDEV_CONTAINER_FQIN: "quay.io/libpod/skopeo_cidev:${IMAGE_SUFFIX}" @@ -163,7 +160,6 @@ meta_task: ${FEDORA_CACHE_IMAGE_NAME} ${PRIOR_FEDORA_CACHE_IMAGE_NAME} ${UBUNTU_CACHE_IMAGE_NAME} - ${PRIOR_UBUNTU_CACHE_IMAGE_NAME} BUILDID: "${CIRRUS_BUILD_ID}" REPOREF: "${CIRRUS_REPO_NAME}" GCPJSON: ENCRYPTED[04306103eee1933f87deb8a5af6514a7e3164aa589d6079abc0451eb2360879430ed020d6e025ca64ef667138ce9d786]