Skip to content

Commit

Permalink
update images
Browse files Browse the repository at this point in the history
Requires emergency override of containers.conf SNAFU with zstd:chunked

containers/common#1730

Signed-off-by: Ed Santiago <santiago@redhat.com>
  • Loading branch information
edsantiago committed Nov 9, 2023
1 parent b1b966e commit 2b60f12
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 1 addition & 1 deletion IMG_SFX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20231004t194547z-f39f38d13
20231109t195120z-f39f38d13
4 changes: 4 additions & 0 deletions cache_images/fedora_packaging.sh
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,10 @@ DOWNLOAD_PACKAGES=(\
msg "Installing general build/test dependencies"
bigto $SUDO dnf install -y $EXARG "${INSTALL_PACKAGES[@]}"

# FIXME! 2023-11-09 emergency workaround for zstd:chunked crisis
# Override until such time as podman tests actually *WORK* with zstd
sed -i -e '/^compression_format/d' /usr/share/containers/containers.conf

msg "Downloading packages for optional installation at runtime, as needed."
$SUDO mkdir -p "$PACKAGE_DOWNLOAD_DIR"
cd "$PACKAGE_DOWNLOAD_DIR"
Expand Down
7 changes: 6 additions & 1 deletion ccia/Containerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
ARG BASE_NAME=registry.fedoraproject.org/fedora-minimal
ARG BASE_TAG=latest
# FIXME FIXME FIXME! 2023-11-09: revert "38" to "latest"
# ...38 is because as of this moment, latest is 39, which
# has python-3.12, which causes something to barf:
# aiohttp/_websocket.c:3744:45: error: ‘PyLongObject’ {aka ‘struct _longobject’} has no member named ‘ob_digit’
# Possible cause: https://github.com/cython/cython/issues/5238
ARG BASE_TAG=38
FROM ${BASE_NAME}:${BASE_TAG} as updated_base

RUN microdnf upgrade -y && \
Expand Down

0 comments on commit 2b60f12

Please sign in to comment.