From 49fc12284cd6f87172a4ceb3b75eda342bf67e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 7 Oct 2024 17:07:22 +0200 Subject: [PATCH 1/2] Update to Fedora 41 with dnf5 This should be faster, see https://fedoraproject.org/wiki/Changes/ReplaceDnfWithDnf5 > Significantly faster for many user cases > Optimization of download metadata Fedora 41 is currently still in beta, but if this causes trouble, we can always revert. Related to https://github.com/python/cpython-devcontainers/issues/8 --- devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devcontainer/Dockerfile b/devcontainer/Dockerfile index 5367238..3d19eda 100644 --- a/devcontainer/Dockerfile +++ b/devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/fedora:40 +FROM docker.io/library/fedora:41 ENV CC=clang @@ -9,7 +9,7 @@ ENV WASMTIME_HOME=/opt/wasmtime ENV WASMTIME_VERSION=22.0.0 ENV WASMTIME_CPU_ARCH=x86_64 -RUN dnf -y --nodocs --setopt=install_weak_deps=False install /usr/bin/{blurb,clang,curl,git,ln,tar,xz} 'dnf-command(builddep)' && \ +RUN dnf -y --nodocs --setopt=install_weak_deps=False install /usr/bin/{blurb,clang,curl,git,ln,tar,xz} 'dnf5-command(builddep)' && \ dnf -y --nodocs --setopt=install_weak_deps=False builddep python3 && \ dnf -y clean all From 4b4f5468ca3c257c79f36a3bdb779b3cef0c4884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 7 Oct 2024 17:11:54 +0200 Subject: [PATCH 2/2] Disable extra repository with a multimedia codec The repository is enabled by default but we don't need it. By explicitly disabling it, we prevent unnecessary metadata fetch. Related to https://github.com/python/cpython-devcontainers/issues/8 --- devcontainer/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devcontainer/Dockerfile b/devcontainer/Dockerfile index 3d19eda..073e393 100644 --- a/devcontainer/Dockerfile +++ b/devcontainer/Dockerfile @@ -9,8 +9,8 @@ ENV WASMTIME_HOME=/opt/wasmtime ENV WASMTIME_VERSION=22.0.0 ENV WASMTIME_CPU_ARCH=x86_64 -RUN dnf -y --nodocs --setopt=install_weak_deps=False install /usr/bin/{blurb,clang,curl,git,ln,tar,xz} 'dnf5-command(builddep)' && \ - dnf -y --nodocs --setopt=install_weak_deps=False builddep python3 && \ +RUN dnf -y --nodocs --setopt=install_weak_deps=False --disablerepo=fedora-cisco-openh264 install /usr/bin/{blurb,clang,curl,git,ln,tar,xz} 'dnf5-command(builddep)' && \ + dnf -y --nodocs --setopt=install_weak_deps=False --disablerepo=fedora-cisco-openh264 builddep python3 && \ dnf -y clean all RUN mkdir ${WASI_SDK_PATH} && \