From 0078f3e1a656336323dfc69f032c3b9cd3c7672c Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 20 Sep 2022 23:01:49 +0000 Subject: [PATCH] import skopeo-1.2.4-2.module+el8.7.0+16212+65e1b35f --- .gitignore | 2 +- .skopeo.metadata | 2 +- SOURCES/shortnames.conf | 44 ++++++++++++++++++++++++++++++++++++++++- SPECS/skopeo.spec | 9 +++++++-- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ef3d5c2..7749b4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/release-1.2-9921983.tar.gz +SOURCES/release-1.2-7300333.tar.gz diff --git a/.skopeo.metadata b/.skopeo.metadata index 23df119..c72c4a5 100644 --- a/.skopeo.metadata +++ b/.skopeo.metadata @@ -1 +1 @@ -986a706db6d55935d813aa3a8d43d22fa519bdc1 SOURCES/release-1.2-9921983.tar.gz +163a914d0509187c816c20c622ad97418fc1db84 SOURCES/release-1.2-7300333.tar.gz diff --git a/SOURCES/shortnames.conf b/SOURCES/shortnames.conf index 0f6827c..56f772d 100644 --- a/SOURCES/shortnames.conf +++ b/SOURCES/shortnames.conf @@ -1,15 +1,21 @@ [aliases] + # almalinux + "almalinux" = "docker.io/library/almalinux" + "almalinux-minimal" = "docker.io/library/almalinux-minimal" + # Arch Linux + "archlinux" = "docker.io/archlinux/archlinux" # centos "centos" = "quay.io/centos/centos" # containers "skopeo" = "quay.io/skopeo/stable" "buildah" = "quay.io/buildah/stable" "podman" = "quay.io/podman/stable" + "hello" = "quay.io/podman/hello" + "hello-world" = "quay.io/podman/hello" # docker "alpine" = "docker.io/library/alpine" "docker" = "docker.io/library/docker" "registry" = "docker.io/library/registry" - "hello-world" = "docker.io/library/hello-world" "swarm" = "docker.io/library/swarm" # Fedora "fedora-minimal" = "registry.fedoraproject.org/fedora-minimal" @@ -40,9 +46,25 @@ "rhel" = "registry.access.redhat.com/rhel" "rhel6" = "registry.access.redhat.com/rhel6" "rhel7" = "registry.access.redhat.com/rhel7" + "rhel7.9" = "registry.access.redhat.com/rhel7.9" + "rhel-atomic" = "registry.access.redhat.com/rhel-atomic" + "rhel-minimal" = "registry.access.redhat.com/rhel-minimum" + "rhel-init" = "registry.access.redhat.com/rhel-init" + "rhel7-atomic" = "registry.access.redhat.com/rhel7-atomic" + "rhel7-minimal" = "registry.access.redhat.com/rhel7-minimum" + "rhel7-init" = "registry.access.redhat.com/rhel7-init" + "rhel7/rhel" = "registry.access.redhat.com/rhel7/rhel" + "rhel7/rhel-atomic" = "registry.access.redhat.com/rhel7/rhel7/rhel-atomic" + "ubi7/ubi" = "registry.access.redhat.com/ubi7/ubi" + "ubi7/ubi-minimal" = "registry.access.redhat.com/ubi7-minimal" + "ubi7/ubi-init" = "registry.access.redhat.com/ubi7-init" "ubi7" = "registry.access.redhat.com/ubi7" "ubi7-init" = "registry.access.redhat.com/ubi7-init" "ubi7-minimal" = "registry.access.redhat.com/ubi7-minimal" + "rhel8" = "registry.access.redhat.com/ubi8" + "rhel8-init" = "registry.access.redhat.com/ubi8-init" + "rhel8-minimal" = "registry.access.redhat.com/ubi8-minimal" + "rhel8-micro" = "registry.access.redhat.com/ubi8-micro" "ubi8" = "registry.access.redhat.com/ubi8" "ubi8-minimal" = "registry.access.redhat.com/ubi8-minimal" "ubi8-init" = "registry.access.redhat.com/ubi8-init" @@ -51,8 +73,28 @@ "ubi8/ubi-minimal" = "registry.access.redhat.com/ubi8-minimal" "ubi8/ubi-init" = "registry.access.redhat.com/ubi8-init" "ubi8/ubi-micro" = "registry.access.redhat.com/ubi8-micro" + "rhel9" = "registry.access.redhat.com/ubi9" + "rhel9-init" = "registry.access.redhat.com/ubi9-init" + "rhel9-minimal" = "registry.access.redhat.com/ubi9-minimal" + "rhel9-micro" = "registry.access.redhat.com/ubi9-micro" + "ubi9" = "registry.access.redhat.com/ubi9" + "ubi9-minimal" = "registry.access.redhat.com/ubi9-minimal" + "ubi9-init" = "registry.access.redhat.com/ubi9-init" + "ubi9-micro" = "registry.access.redhat.com/ubi9-micro" + "ubi9/ubi" = "registry.access.redhat.com/ubi9/ubi" + "ubi9/ubi-minimal" = "registry.access.redhat.com/ubi9-minimal" + "ubi9/ubi-init" = "registry.access.redhat.com/ubi9-init" + "ubi9/ubi-micro" = "registry.access.redhat.com/ubi9-micro" + # Rocky Linux + "rockylinux" = "docker.io/library/rockylinux" # Debian "debian" = "docker.io/library/debian" + # Kali Linux + "kali-bleeding-edge" = "docker.io/kalilinux/kali-bleeding-edge" + "kali-dev" = "docker.io/kalilinux/kali-dev" + "kali-experimental" = "docker.io/kalilinux/kali-experimental" + "kali-last-release" = "docker.io/kalilinux/kali-last-release" + "kali-rolling" = "docker.io/kalilinux/kali-rolling" # Ubuntu "ubuntu" = "docker.io/library/ubuntu" # Oracle Linux diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec index bcde188..7c9f8de 100644 --- a/SPECS/skopeo.spec +++ b/SPECS/skopeo.spec @@ -22,13 +22,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global common_branch v0.33.4 %global storage_branch v1.24.6 %global shortnames_branch main -%global commit0 99219839236053c4fc27e3099639fcecb1378a3e +%global commit0 7300333dc4ae6de35af9f4f970d064fb124fc6a6 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 1 Name: skopeo Version: 1.2.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -233,6 +233,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Tue May 03 2022 Jindrich Novy - 1:1.2.4-2 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.2 + (https://github.com/containers/skopeo/commit/7300333) +- Related: #2061390 + * Wed Sep 15 2021 Jindrich Novy - 1:1.2.4-1 - update to the latest content of https://github.com/containers/skopeo/tree/release-1.2 (https://github.com/containers/skopeo/commit/9921983)