Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Correct upstream podman issue #438

Merged
merged 4 commits into from
Dec 2, 2023
Merged

fix: Correct upstream podman issue #438

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f2a307c
fix: Correct upstream podman issue
KyleGospo Dec 2, 2023
7669130
chore: Apply to all images
KyleGospo Dec 2, 2023
131c7e7
Run different overrides on F37 and F38
p5 Dec 2, 2023
e4b03a8
Update Containerfile
p5 Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -19,6 +19,13 @@ 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; \
elif [ "$FEDORA_MAJOR_VERSION" = "38" ]; then \
rpm-ostree override replace https://bodhi.fedoraproject.org/updates/FEDORA-2023-c72015807c; \
fi
p5 marked this conversation as resolved.
Show resolved Hide resolved

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 && \
Expand Down
Loading