From a6d0a99c1bf218ed79683489d140a19cc6678d52 Mon Sep 17 00:00:00 2001 From: Jan Pazdziora Date: Sat, 10 Dec 2022 22:43:20 +0100 Subject: [PATCH] Revert "Workaround 2151833 (and 2151844).." This reverts commit e36e2aaf6cfefe512c8a4330a762fc3ede712c57. The problem was fixed. --- Dockerfile.fedora-rawhide | 5 ++--- ci/label-image.sh | 4 ---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/Dockerfile.fedora-rawhide b/Dockerfile.fedora-rawhide index 434dd539..8652ab04 100644 --- 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 index 5dab9e01..d6ab0415 100755 --- 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 }' )