From 9a27ad528d4a9a3915abbb7294b7a16032421358 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Feb 01 2024 11:46:21 +0000 Subject: bump to v0.57.3 check if `short-name-mode="enforcing"` exists in registries.conf and enabled. Remove `-e` option from update.sh to not exit on non-zero error at finding `short-name-mode="enforcing"`. Signed-off-by: Lokesh Mandvekar --- diff --git a/containers-common.spec b/containers-common.spec index e38a1aa..5dbbca5 100644 --- a/containers-common.spec +++ b/containers-common.spec @@ -12,7 +12,7 @@ Epoch: 5 Name: containers-common -Version: 0.57.1 +Version: 0.57.3 Release: %autorelease License: Apache-2.0 BuildArch: noarch diff --git a/registries.conf b/registries.conf index db62524..9bee379 100644 --- a/registries.conf +++ b/registries.conf @@ -75,3 +75,5 @@ unqualified-search-registries = ["registry.fedoraproject.org", "registry.access. # # 2. example-mirror-1.local/mirrors/foo/image:latest # # 3. internal-registry-for-example.com/bar/image:latest # # in order, and use the first one that exists. + +short-name-mode="enforcing" diff --git a/update.sh b/update.sh index ba6c078..350c236 100755 --- a/update.sh +++ b/update.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -set -eox pipefail +set -ox pipefail spectool -fg containers-common.spec @@ -22,7 +22,7 @@ sed -i '/\"socketcall\",/i \ sed -i 's/^#.*unqualified-search-registries.*=.*/unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "docker.io", "quay.io"]/g' \ registries.conf -grep 'short-name-mode="enforcing"' registries.conf +grep '^short-name-mode="enforcing"' registries.conf if [[ $? == 1 ]]; then echo -e '\nshort-name-mode="enforcing"' >> registries.conf fi