From f2a307c7a04f2745cf218f0f8b9854df2dbfae99 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 2 Dec 2023 12:51:47 -0800 Subject: [PATCH 1/4] fix: Correct upstream podman issue --- Containerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Containerfile b/Containerfile index 766a49c9..2f424dfc 100644 --- a/Containerfile +++ b/Containerfile @@ -44,6 +44,9 @@ COPY kmods-sys_files /tmp/kmods-files COPY --from=ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms +# Workaround for podman issue upstream. +RUN rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2023-00c78aad58 + # kmods-install.sh will error if running in Fedora 39 or newer. RUN /tmp/kmods-install.sh && \ rm -rf /tmp/* /var/* && \ From 7669130cf9052afd9c888a70166903b5196e6bf1 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sat, 2 Dec 2023 13:02:16 -0800 Subject: [PATCH 2/4] chore: Apply to all images --- Containerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index 2f424dfc..ec2e5098 100644 --- a/Containerfile +++ b/Containerfile @@ -19,6 +19,9 @@ COPY github-release-install.sh \ COPY --from=ghcr.io/ublue-os/config:latest /rpms /tmp/rpms COPY --from=ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} /rpms/ublue-os /tmp/rpms +# Workaround for podman issue upstream. +RUN rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2023-00c78aad58 + RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-$(rpm -E %fedora)/ublue-os-staging-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os_staging.repo && \ wget https://copr.fedorainfracloud.org/coprs/kylegospo/oversteer/repo/fedora-$(rpm -E %fedora)/kylegospo-oversteer-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo_oversteer.repo && \ /tmp/install.sh && \ @@ -44,9 +47,6 @@ COPY kmods-sys_files /tmp/kmods-files COPY --from=ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms -# Workaround for podman issue upstream. -RUN rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2023-00c78aad58 - # kmods-install.sh will error if running in Fedora 39 or newer. RUN /tmp/kmods-install.sh && \ rm -rf /tmp/* /var/* && \ From 131c7e7aa6c2e4223049440e138d1585a3f14040 Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sat, 2 Dec 2023 21:35:34 +0000 Subject: [PATCH 3/4] Run different overrides on F37 and F38 --- Containerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Containerfile b/Containerfile index ec2e5098..cc97b6e8 100644 --- a/Containerfile +++ b/Containerfile @@ -7,7 +7,7 @@ ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS nokmods ARG IMAGE_NAME="${IMAGE_NAME:-silverblue}" -ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}" +ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-39}" COPY github-release-install.sh \ install.sh \ @@ -19,8 +19,12 @@ COPY github-release-install.sh \ COPY --from=ghcr.io/ublue-os/config:latest /rpms /tmp/rpms COPY --from=ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} /rpms/ublue-os /tmp/rpms -# Workaround for podman issue upstream. -RUN rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2023-00c78aad58 +# # Workaround for podman issue upstream - https://github.com/containers/podman/issues/20872 +RUN if [ "$FEDORA_MAJOR_VERSION" = "39" ]; then \ + rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2023-00c78aad58; \ + elif [ "$FEDORA_MAJOR_VERSION" = "38" ]; then \ + rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2023-c72015807c; \ + fi RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-$(rpm -E %fedora)/ublue-os-staging-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os_staging.repo && \ wget https://copr.fedorainfracloud.org/coprs/kylegospo/oversteer/repo/fedora-$(rpm -E %fedora)/kylegospo-oversteer-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo_oversteer.repo && \ From e4b03a80232560416de2aba89a368eb98697732e Mon Sep 17 00:00:00 2001 From: Robert Sturla Date: Sat, 2 Dec 2023 21:46:04 +0000 Subject: [PATCH 4/4] Update Containerfile --- Containerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Containerfile b/Containerfile index cc97b6e8..19edab3f 100644 --- a/Containerfile +++ b/Containerfile @@ -22,8 +22,6 @@ COPY --from=ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} /rpms/ublue-os # # Workaround for podman issue upstream - https://github.com/containers/podman/issues/20872 RUN if [ "$FEDORA_MAJOR_VERSION" = "39" ]; then \ rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2023-00c78aad58; \ - elif [ "$FEDORA_MAJOR_VERSION" = "38" ]; then \ - rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2023-c72015807c; \ fi RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-$(rpm -E %fedora)/ublue-os-staging-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os_staging.repo && \