Skip to content

Commit

Permalink
remove mounts from podman containerfile; breaks in GH Action
Browse files Browse the repository at this point in the history
  • Loading branch information
bayou-brogrammer committed Feb 10, 2024
1 parent 203a7bc commit efb2029
Showing 1 changed file with 6 additions and 11 deletions.
17 changes: 6 additions & 11 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/prompt/repo/fedora-$(
wget https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${FEDORA_MAJOR_VERSION}"/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/ublue-os-staging-fedora-"${FEDORA_MAJOR_VERSION}".repo

# Remove unneeded packages
RUN --mount=type=cache,target=/var/cache/rpm-ostree \
rpm-ostree override remove \
RUN rpm-ostree override remove \
power-profiles-daemon \
|| true && \
rpm-ostree override remove \
Expand All @@ -40,8 +39,7 @@ RUN --mount=type=cache,target=/var/cache/rpm-ostree \
|| true

# Setup firmware and asusctl for ASUS devices
RUN --mount=type=cache,target=/var/cache/asus-firmware \
if [[ "${IMAGE_FLAVOR}" =~ "asus" ]]; then \
RUN if [[ "${IMAGE_FLAVOR}" =~ "asus" ]]; then \
wget https://copr.fedorainfracloud.org/coprs/lukenukem/asus-linux/repo/fedora-$(rpm -E %fedora)/lukenukem-asus-linux-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_lukenukem-asus-linux.repo && \
rpm-ostree install \
asusctl \
Expand All @@ -53,7 +51,7 @@ RUN --mount=type=cache,target=/var/cache/asus-firmware \

# Add ublue kmods, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
COPY --from=bluefin-akmods /rpms /tmp/akmods-rpms
RUN --mount=type=cache,target=/var/cache/akmods <<EOF
RUN <<EOF
wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo
rpm-ostree install \
Expand All @@ -69,8 +67,7 @@ RUN --mount=type=cache,target=/var/cache/akmods <<EOF
EOF

# GNOME VRR & Prompt
RUN --mount=type=cache,target=/var/cache/gnome-prompt \
rpm-ostree override replace \
RUN rpm-ostree override replace \
--experimental \
--from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr \
mutter \
Expand All @@ -88,8 +85,7 @@ RUN --mount=type=cache,target=/var/cache/gnome-prompt \
rm -f /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
rm -f /etc/yum.repos.d/_copr_kylegospo-prompt.repo

RUN --mount=type=cache,target=/var/cache/bluefin \
/tmp/scripts/starship.sh && \
RUN /tmp/scripts/starship.sh && \
/tmp/scripts/build.sh && \
/tmp/scripts/image-info.sh && \
/tmp/scripts/fetch-quadlets.sh && \
Expand Down Expand Up @@ -165,8 +161,7 @@ RUN wget https://github.com/docker/compose/releases/latest/download/docker-compo
wget https://copr.fedorainfracloud.org/coprs/atim/ubuntu-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo -O /etc/yum.repos.d/atim-ubuntu-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo

# Handle packages via packages.json
RUN --mount=type=cache,target=/var/cache/bluefin-dx \
/tmp/scripts/build.sh && \
RUN /tmp/scripts/build.sh && \
/tmp/scripts/image-info.sh

# docker-compose and kind
Expand Down

0 comments on commit efb2029

Please sign in to comment.