Revert "Workaround 2151833 (and 2151844).."

This reverts commit e36e2aa. The problem was fixed.
wjn0918 · Dec 10, 2022 · a6d0a99 · a6d0a99
1 parent e36e2aa
commit a6d0a99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/Dockerfile.fedora-rawhide b/Dockerfile.fedora-rawhide
@@ -1,5 +1,5 @@
 # Clone from the Fedora rawhide image
-FROM docker.io/library/fedora:rawhide
+FROM registry.fedoraproject.org/fedora:rawhide
 
 RUN groupadd -g 288 kdcproxy ; useradd -u 288 -g 288 -c 'IPA KDC Proxy User' -r -d '/var/lib/kdcproxy' -s '/sbin/nologin' kdcproxy
 RUN groupadd -g 289 ipaapi; useradd -u 289 -g 289 -c 'IPA Framework User' -r -d / -s '/sbin/nologin' ipaapi
@@ -18,8 +18,7 @@ RUN systemctl mask rpc-gssd.service
 
 # Container image which runs systemd
 # debug: RUN test -f /etc/machine-id && ! test -s /etc/machine-id
-# debug: RUN test -z "$container"
-ENV container oci
+# debug: RUN test "$container" = oci
 
 # Establish reasonably low open files limit in the container
 RUN echo "DefaultLimitNOFILE=1024" >> /etc/systemd/system.conf

diff --git a/ci/label-image.sh b/ci/label-image.sh
@@ -24,10 +24,6 @@ if [ -z "$BASE_DIGEST" ] ; then
 	# Since docker images strips the docker.io/ prefix, try again without it
 	BASE_DIGEST=$( $docker images --digests --format '{{.Repository}}:{{.Tag}} {{.Digest}}' | awk -v image="${FROM#docker.io/}" '$1 == image { print $2 }' )
 fi
-if [ -z "$BASE_DIGEST" ] ; then
-	# Since docker images strips the docker.io/library/ prefix, try again without it
-	BASE_DIGEST=$( $docker images --digests --format '{{.Repository}}:{{.Tag}} {{.Digest}}' | awk -v image="${FROM#docker.io/library/}" '$1 == image { print $2 }' )
-fi
 if [ -z "$BASE_DIGEST" ] ; then
 	# When FROM does not specify a tag, try again with :latest
 	BASE_DIGEST=$( $docker images --digests --format '{{.Repository}}:{{.Tag}} {{.Digest}}' | awk -v image="$FROM:latest" '$1 == image { print $2 }' )