From 918320b93ec5cfe742375a37b40651950c904074 Mon Sep 17 00:00:00 2001 From: Brian Carey Date: Mon, 23 Sep 2024 13:34:27 +0100 Subject: [PATCH] Revert "bootstrap: Add workaround for corrupted image pulls with podman (#3639)" (#3666) The fix for the issue that this workaround was added for has been included in Fedora 40. ``` [root@b873a1829fa1 /]# cat /etc/redhat-release Fedora release 40 (Forty) [root@b873a1829fa1 /]# rpm -qa | grep zlib-ng zlib-ng-compat-2.1.7-2.fc40.x86_64 ``` This reverts commit 16816d317dbe52c99d80c652c46d0ee7e7c0e115. Signed-off-by: Brian Carey --- images/bootstrap/Dockerfile | 3 --- 1 file changed, 3 deletions(-) diff --git a/images/bootstrap/Dockerfile b/images/bootstrap/Dockerfile index 730f6f3f8c..1a35455242 100644 --- a/images/bootstrap/Dockerfile +++ b/images/bootstrap/Dockerfile @@ -118,9 +118,6 @@ RUN mkdir -p /etc/setup.mixin.d/ && mkdir -p /etc/teardown.mixin.d/ # Trust git repositories used for e2e jobs RUN git config --global --add safe.directory '*' -# FIXME: Workaround for issue pulling images with podman on Fedora 40 - https://github.com/containers/podman/issues/23822 -RUN ln -s /usr/bin/gzip /usr/local/bin/pigz - # note the runner is also responsible for making podman in container function if # env PODMAN_IN_CONTAINER_ENABLED is set and similarly responsible for generating