diff --git a/Containerfile b/Containerfile index 766a49c9..19edab3f 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,6 +19,11 @@ 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 - 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; \ + 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 && \ /tmp/install.sh && \