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 <lsm5@redhat.com>
This commit is contained in:
parent
2dcf69d1ad
commit
9a27ad528d
@ -12,7 +12,7 @@
|
|||||||
|
|
||||||
Epoch: 5
|
Epoch: 5
|
||||||
Name: containers-common
|
Name: containers-common
|
||||||
Version: 0.57.1
|
Version: 0.57.3
|
||||||
Release: %autorelease
|
Release: %autorelease
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
@ -75,3 +75,5 @@ unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.
|
|||||||
# # 2. example-mirror-1.local/mirrors/foo/image:latest
|
# # 2. example-mirror-1.local/mirrors/foo/image:latest
|
||||||
# # 3. internal-registry-for-example.com/bar/image:latest
|
# # 3. internal-registry-for-example.com/bar/image:latest
|
||||||
# # in order, and use the first one that exists.
|
# # in order, and use the first one that exists.
|
||||||
|
|
||||||
|
short-name-mode="enforcing"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
set -eox pipefail
|
set -ox pipefail
|
||||||
|
|
||||||
spectool -fg containers-common.spec
|
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' \
|
sed -i 's/^#.*unqualified-search-registries.*=.*/unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "docker.io", "quay.io"]/g' \
|
||||||
registries.conf
|
registries.conf
|
||||||
|
|
||||||
grep 'short-name-mode="enforcing"' registries.conf
|
grep '^short-name-mode="enforcing"' registries.conf
|
||||||
if [[ $? == 1 ]]; then
|
if [[ $? == 1 ]]; then
|
||||||
echo -e '\nshort-name-mode="enforcing"' >> registries.conf
|
echo -e '\nshort-name-mode="enforcing"' >> registries.conf
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user