From b71efbfccd1b8dfa19dd19ee52e4b4eeb44009d4 Mon Sep 17 00:00:00 2001 From: Jindrich Novy Date: Mon, 5 Jul 2021 11:32:27 +0200 Subject: [PATCH] skopeo-1.3.1-4.el9 - update to the latest content of https://github.com/containers/skopeo/tree/release-1.3 (https://github.com/containers/skopeo/commit/038f70e) - Related: #1970747 Signed-off-by: Jindrich Novy --- 001-rhel-shortnames-pyxis.conf | 24 ++++++++++++------------ skopeo.spec | 9 +++++++-- sources | 2 +- 3 files changed, 20 insertions(+), 15 deletions(-) diff --git a/001-rhel-shortnames-pyxis.conf b/001-rhel-shortnames-pyxis.conf index 1b5222f..0a34814 100644 --- a/001-rhel-shortnames-pyxis.conf +++ b/001-rhel-shortnames-pyxis.conf @@ -60,10 +60,7 @@ "amq7/ams-interconnect" = "registry.access.redhat.com/amq7/ams-interconnect" "anchore/anchore-enterprise-bundle" = "registry.redhat.io/anchore/anchore-enterprise-bundle" "anchore/anchore-enterprise-operator" = "registry.connect.redhat.com/anchore/anchore-enterprise-operator" -"anchore/engine0" = "registry.connect.redhat.com/anchore/engine0" "anchore/enterprise-operator" = "registry.connect.redhat.com/anchore/enterprise-operator" -"anchore/enterprise" = "registry.connect.redhat.com/anchore/enterprise" -"anchore/enterprise-ui" = "registry.connect.redhat.com/anchore/enterprise-ui" "ansible-tower-37/ansible-runner-rhel7" = "registry.redhat.io/ansible-tower-37/ansible-runner-rhel7" "ansible-tower-37/ansible-tower-memcached-rhel7" = "registry.redhat.io/ansible-tower-37/ansible-tower-memcached-rhel7" "ansible-tower-37/ansible-tower-rhel7" = "registry.redhat.io/ansible-tower-37/ansible-tower-rhel7" @@ -125,7 +122,7 @@ "bigid/bigid-corr-new" = "registry.connect.redhat.com/bigid/bigid-corr-new" "bigid/bigid-me-agent" = "registry.connect.redhat.com/bigid/bigid-me-agent" "bigid/bigid-ml" = "registry.connect.redhat.com/bigid/bigid-ml" -"bigid/bigid-ner" = "registry.redhat.io/bigid/bigid-ner" +"bigid/bigid-ner" = "registry.connect.redhat.com/bigid/bigid-ner" "bigid/bigid-operator-bundle" = "registry.connect.redhat.com/bigid/bigid-operator-bundle" "bigid/bigid-operator" = "registry.connect.redhat.com/bigid/bigid-operator" "bigid/bigid-orch" = "registry.connect.redhat.com/bigid/bigid-orch" @@ -284,6 +281,7 @@ "cockroachdb/cockroach" = "registry.connect.redhat.com/cockroachdb/cockroach" "cockroachdb/request-cert" = "registry.connect.redhat.com/cockroachdb/request-cert" "codeready-workspaces/crw-2-rhel8-operator" = "registry.redhat.io/codeready-workspaces/crw-2-rhel8-operator" +"codeready-workspaces/dashboard-rhel8" = "registry.redhat.io/codeready-workspaces/dashboard-rhel8" "codeready-workspaces/devfileregistry-rhel8" = "registry.redhat.io/codeready-workspaces/devfileregistry-rhel8" "codeready-workspaces/imagepuller-rhel8" = "registry.redhat.io/codeready-workspaces/imagepuller-rhel8" "codeready-workspaces/jwtproxy-rhel8" = "registry.redhat.io/codeready-workspaces/jwtproxy-rhel8" @@ -301,6 +299,7 @@ "codeready-workspaces/theia-endpoint-rhel8" = "registry.redhat.io/codeready-workspaces/theia-endpoint-rhel8" "codeready-workspaces/theia-rhel8" = "registry.redhat.io/codeready-workspaces/theia-rhel8" "commvault-hedvig/hedvig-operator1" = "registry.connect.redhat.com/commvault-hedvig/hedvig-operator1" +"compliance/openshift-compliance-rhel8-operator" = "registry.redhat.io/compliance/openshift-compliance-rhel8-operator" "container-native-virtualization/bridge-marker" = "registry.redhat.io/container-native-virtualization/bridge-marker" "container-native-virtualization/cluster-network-addons-operator" = "registry.redhat.io/container-native-virtualization/cluster-network-addons-operator" "container-native-virtualization/cnv-containernetworking-plugins" = "registry.redhat.io/container-native-virtualization/cnv-containernetworking-plugins" @@ -471,7 +470,6 @@ "dynatrace/dynatrace-operator-bundle" = "registry.redhat.io/dynatrace/dynatrace-operator-bundle" "dynatrace/dynatrace-operator" = "registry.connect.redhat.com/dynatrace/dynatrace-operator" "dynatrace/oneagent" = "registry.connect.redhat.com/dynatrace/oneagent" -"e2e-container/e2e-cve-rebuilds-operator-bundle" = "registry.redhat.io/e2e-container/e2e-cve-rebuilds-operator-bundle" "e2e-container/workflow-test" = "registry.access.redhat.com/e2e-container/workflow-test" "edb/edb-operator" = "quay.io/edb/edb-operator" "elastic/apm" = "registry.connect.redhat.com/elastic/apm" @@ -705,7 +703,9 @@ "integration/rh-integration-operator-bundle" = "registry.redhat.io/integration/rh-integration-operator-bundle" "integration/rh-integration-rhel8-operator" = "registry.redhat.io/integration/rh-integration-rhel8-operator" "integration/rhi-rhel8-operator" = "registry.redhat.io/integration/rhi-rhel8-operator" +"integration/service-registry-kafkasql-rhel8" = "registry.redhat.io/integration/service-registry-kafkasql-rhel8" "integration/service-registry-rhel8-operator" = "registry.redhat.io/integration/service-registry-rhel8-operator" +"integration/service-registry-sql-rhel8" = "registry.redhat.io/integration/service-registry-sql-rhel8" "integration/service-registry-streams-rhel8" = "registry.redhat.io/integration/service-registry-streams-rhel8" "intel/n3000-daemon" = "registry.connect.redhat.com/intel/n3000-daemon" "intel/n3000-driver" = "registry.connect.redhat.com/intel/n3000-driver" @@ -713,10 +713,6 @@ "intel/n3000-monitoring" = "registry.connect.redhat.com/intel/n3000-monitoring" "intel/n3000-operator-bundle" = "registry.connect.redhat.com/intel/n3000-operator-bundle" "intel/n3000-operator" = "registry.connect.redhat.com/intel/n3000-operator" -"intel/openvino-model-server" = "registry.redhat.io/intel/openvino-model-server" -"intel/openvino-runtime" = "registry.connect.redhat.com/intel/openvino-runtime" -"intel/ovms-operator-bundle" = "registry.redhat.io/intel/ovms-operator-bundle" -"intel/ovms-operator" = "registry.connect.redhat.com/intel/ovms-operator" "intel/sriov-fec-daemon" = "registry.connect.redhat.com/intel/sriov-fec-daemon" "intel/sriov-fec-operator-bundle" = "registry.connect.redhat.com/intel/sriov-fec-operator-bundle" "intel/sriov-fec-operator" = "registry.connect.redhat.com/intel/sriov-fec-operator" @@ -748,9 +744,11 @@ "jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8" "jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7" "jboss-eap-7/eap-xp2-openjdk8-runtime-openshift-rhel7" = "registry.redhat.io/jboss-eap-7/eap-xp2-openjdk8-runtime-openshift-rhel7" +"jboss-eap-7/eap-xp3-openj9-11-openshift-rhel8" = "registry.redhat.io/jboss-eap-7/eap-xp3-openj9-11-openshift-rhel8" "jboss-fuse-6/fis-java-openshift" = "registry.access.redhat.com/jboss-fuse-6/fis-java-openshift" "jboss-fuse-6/fis-karaf-openshift" = "registry.access.redhat.com/jboss-fuse-6/fis-karaf-openshift" "jboss-webserver-5/webserver54-openj9-11-tomcat9-openshift-rhel8" = "registry.redhat.io/jboss-webserver-5/webserver54-openj9-11-tomcat9-openshift-rhel8" +"jboss-webserver-5/webserver55-openj9-11-tomcat9-openshift-rhel8" = "registry.redhat.io/jboss-webserver-5/webserver55-openj9-11-tomcat9-openshift-rhel8" "jboss-webserver-5/webserver55-openjdk11-tomcat9-openshift-rhel8" = "registry.redhat.io/jboss-webserver-5/webserver55-openjdk11-tomcat9-openshift-rhel8" "jboss-webserver-5/webserver55-openjdk8-tomcat9-openshift-rhel8" = "registry.redhat.io/jboss-webserver-5/webserver55-openjdk8-tomcat9-openshift-rhel8" "jboss-webserver-5/webserver-openjdk8-operator-bundle" = "registry.redhat.io/jboss-webserver-5/webserver-openjdk8-operator-bundle" @@ -786,7 +784,7 @@ "joget/joget-dx-operator-bundle" = "registry.connect.redhat.com/joget/joget-dx-operator-bundle" "joget/joget-dx-operator" = "registry.redhat.io/joget/joget-dx-operator" "kasten/aggregatedapis" = "registry.connect.redhat.com/kasten/aggregatedapis" -"kasten/ambassador" = "registry.redhat.io/kasten/ambassador" +"kasten/ambassador" = "registry.connect.redhat.com/kasten/ambassador" "kasten/auth" = "registry.connect.redhat.com/kasten/auth" "kasten/catalog" = "registry.redhat.io/kasten/catalog" "kasten/cephtool" = "registry.connect.redhat.com/kasten/cephtool" @@ -1569,7 +1567,8 @@ "openshift-service-mesh/proxyv2-rhel8" = "registry.redhat.io/openshift-service-mesh/proxyv2-rhel8" "openshift-service-mesh/sidecar-injector-rhel8" = "registry.redhat.io/openshift-service-mesh/sidecar-injector-rhel8" "openshift-update-service/cincinnati-operator-bundle" = "registry.redhat.io/openshift-update-service/cincinnati-operator-bundle" -"openshift-update-service/cincinnati-rhel8-operator" = "registry.redhat.io/openshift-update-service/cincinnati-rhel8-operator" +"openshift-update-service/openshift-update-service-rhel8-operator" = "registry.redhat.io/openshift-update-service/openshift-update-service-rhel8-operator" +"openshift-update-service/openshift-update-service-rhel8" = "registry.redhat.io/openshift-update-service/openshift-update-service-rhel8" "operatr-io/kpow-66" = "registry.redhat.io/operatr-io/kpow-66" "operatr-io/kpow-operator-bundle" = "registry.connect.redhat.com/operatr-io/kpow-operator-bundle" "operatr-io/kpow-operator" = "registry.redhat.io/operatr-io/kpow-operator" @@ -1674,6 +1673,7 @@ "realmethods/realmethods-operator-12" = "registry.connect.redhat.com/realmethods/realmethods-operator-12" "redhat-openjdk-18/openjdk18-openshift" = "registry.access.redhat.com/redhat-openjdk-18/openjdk18-openshift" "redhat/redhat-operator-index" = "registry.redhat.io/redhat/redhat-operator-index" +"redhat-sp/testwebserver" = "registry.redhat.io/redhat-sp/testwebserver" "redislabs/alpha" = "registry.connect.redhat.com/redislabs/alpha" "redislabs/gesher" = "registry.connect.redhat.com/redislabs/gesher" "redislabs/redis-enterprise-operator-bundle" = "registry.connect.redhat.com/redislabs/redis-enterprise-operator-bundle" @@ -2198,7 +2198,6 @@ "snyk/kubernetes-monitor" = "registry.redhat.io/snyk/kubernetes-monitor" "snyk/kubernetes-operator-bundle" = "registry.connect.redhat.com/snyk/kubernetes-operator-bundle" "snyk/kubernetes-operator" = "registry.connect.redhat.com/snyk/kubernetes-operator" -"snyk/snyk-operator-bundle" = "registry.connect.redhat.com/snyk/snyk-operator-bundle" "sonatype/nexus-iq-server" = "registry.redhat.io/sonatype/nexus-iq-server" "splunk/sck101" = "registry.connect.redhat.com/splunk/sck101" "sso-7/sso73-openj9-openshift-rhel7" = "registry.redhat.io/sso-7/sso73-openj9-openshift-rhel7" @@ -2467,6 +2466,7 @@ "zabbix/zabbix-java-gateway-50" = "registry.connect.redhat.com/zabbix/zabbix-java-gateway-50" "zabbix/zabbix-operator-certified-44" = "registry.connect.redhat.com/zabbix/zabbix-operator-certified-44" "zabbix/zabbixoperator-certified-bundle" = "registry.connect.redhat.com/zabbix/zabbixoperator-certified-bundle" +"zabbix/zabbix-operator-certified" = "registry.redhat.io/zabbix/zabbix-operator-certified" "zabbix/zabbixoperator-certified" = "registry.redhat.io/zabbix/zabbixoperator-certified" "zabbix/zabbix-proxy-mysql-44" = "registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-44" "zabbix/zabbix-proxy-mysql-50" = "registry.connect.redhat.com/zabbix/zabbix-proxy-mysql-50" diff --git a/skopeo.spec b/skopeo.spec index 83db154..54ffbbf 100644 --- a/skopeo.spec +++ b/skopeo.spec @@ -24,13 +24,13 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl %global common_branch v0.38.4 %global storage_branch v1.31.1 %global shortnames_branch main -%global commit0 e9207c4564dc5ff4c870762c981eca430c203fb7 +%global commit0 038f70e6f52ca354534b2d38ce9611b8fc5537c4 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) Epoch: 1 Name: skopeo Version: 1.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Inspect container images and repositories on registries License: ASL 2.0 URL: %{git0} @@ -241,6 +241,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_datadir}/%{name}/test %changelog +* Mon Jul 05 2021 Jindrich Novy - 1:1.3.1-4 +- update to the latest content of https://github.com/containers/skopeo/tree/release-1.3 + (https://github.com/containers/skopeo/commit/038f70e) +- Related: #1970747 + * Thu Jul 01 2021 Jindrich Novy - 1:1.3.1-3 - update registries.conf to be consistent with upstream - Related: #1970747 diff --git a/sources b/sources index 86832b4..23c4d0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (release-1.3-e9207c4.tar.gz) = 13122dcc0fe0e6e14af3f4150ca436151c114d55d598ca9a752146eba67003b9ab93dc2b594d39d1a6269920fd018e186670582a28c99229ad7fae07944d4b56 +SHA512 (release-1.3-038f70e.tar.gz) = f26764d63abd39c3ba999d847137830c9fcb8cf7cd365f3dca1e7f85e06ee76b18c86b2238d79ed5988d58cbf2a7f8de088dd9f47ada93527b084d4758a345bd