Skip to content

Commit ed0f37f

Browse files
authored
Merge pull request containers#398 from Luap99/new-images
new images
2 parents 21cebe3 + e5a1016 commit ed0f37f

File tree

4 files changed

+2
-18
lines changed

4 files changed

+2
-18
lines changed

IMG_SFX

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20241218t154721z-f41f40d13
1+
20250107t132430z-f41f40d13

cache_images/debian_packaging.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ INSTALL_PACKAGES=(\
4444
fuse-overlayfs
4545
gcc
4646
gettext
47-
git-daemon-run
47+
git
4848
gnupg2
4949
go-md2man
5050
golang

cache_images/fedora_packaging.sh

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -211,18 +211,6 @@ DOWNLOAD_PACKAGES=(\
211211
msg "Installing general build/test dependencies"
212212
bigto $SUDO dnf install -y "${INSTALL_PACKAGES[@]}"
213213

214-
# 2024-12-11 not yet stable on f42
215-
timebomb 20250101 "pasta 2024_12_11.g09478d5 required fix pasta/glibc regression https://github.com/containers/podman/issues/24804"
216-
if [[ "$OS_RELEASE_VER" -eq 42 ]]; then
217-
arch=$(uname -m)
218-
n=passt
219-
v=0%5E20241211.g09478d5
220-
r=1.fc$OS_RELEASE_VER
221-
bigto $SUDO dnf install -y \
222-
https://kojipkgs.fedoraproject.org/packages/$n/$v/$r/$arch/$n-$v-$r.$arch.rpm \
223-
https://kojipkgs.fedoraproject.org/packages/$n/$v/$r/noarch/$n-selinux-$v-$r.noarch.rpm
224-
fi
225-
226214
msg "Downloading packages for optional installation at runtime, as needed."
227215
$SUDO mkdir -p "$PACKAGE_DOWNLOAD_DIR"
228216
cd "$PACKAGE_DOWNLOAD_DIR"

cache_images/rawhide_setup.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ $SUDO sed -i -r -e 's/^gpgcheck=.+/gpgcheck=0/' /etc/yum.repos.d/*.repo
3030
$SUDO dnf5 -y distro-sync --releasever=rawhide --allowerasing
3131
$SUDO dnf5 upgrade -y
3232

33-
# As of May 2024 composefs is heating up
34-
timebomb 20241231 "At some point, composefs should be available on all fedoras"
35-
$SUDO dnf5 -y install composefs
36-
3733
# A shared fedora_packaging.sh script is called next that doesn't always support dnf5
3834
$SUDO ln -s $(type -P dnf5) /usr/local/bin/dnf
3935

0 commit comments

Comments
 (0)