From 82a250e5af9aecf66419e93a9848d121001a7adf Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 29 Mar 2022 13:05:46 -0400 Subject: [PATCH] import skopeo-1.2.4-1.module+el8.6.0+12937+c86eb8d2 --- .gitignore | 2 +- .skopeo.metadata | 2 +- SOURCES/shortnames.conf | 6 ++++-- SPECS/skopeo.spec | 11 ++++++++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 3c64205..ef3d5c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/release-1.2-e72dd9c.tar.gz +SOURCES/release-1.2-9921983.tar.gz diff --git a/.skopeo.metadata b/.skopeo.metadata index b7f56bc..23df119 100644 --- a/.skopeo.metadata +++ b/.skopeo.metadata @@ -1 +1 @@ -a4755f6059727897a3dde8b77756e871409ef459 SOURCES/release-1.2-e72dd9c.tar.gz +986a706db6d55935d813aa3a8d43d22fa519bdc1 SOURCES/release-1.2-9921983.tar.gz diff --git a/SOURCES/shortnames.conf b/SOURCES/shortnames.conf index 0f110a1..0f6827c 100644 --- a/SOURCES/shortnames.conf +++ b/SOURCES/shortnames.conf @@ -56,10 +56,12 @@ # Ubuntu "ubuntu" = "docker.io/library/ubuntu" # Oracle Linux - "oraclelinux" = "docker.io/library/oraclelinux" + "oraclelinux" = "container-registry.oracle.com/os/oraclelinux" # busybox "busybox" = "docker.io/library/busybox" # php "php" = "docker.io/library/php" - #python + # python "python" = "docker.io/library/python" + # node + "node" = "docker.io/library/node" diff --git a/SPECS/skopeo.spec b/SPECS/skopeo.spec index 0b526e5..bcde188 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 e72dd9c5c834f3cd7fb8b1aab4021d9d4412f305 +%global commit0 99219839236053c4fc27e3099639fcecb1378a3e %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 1 Name: skopeo -Version: 1.2.2 -Release: 10%{?dist} +Version: 1.2.4 +Release: 1%{?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 +* 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) +- Related: #2001445 + * Thu Jul 15 2021 Jindrich Novy - 1:1.2.2-10 - update shortnames from Pyxis - sync with the vendored versions in 3.0-8.5.0