Skip to content
Merged
Changes from all commits
Commits
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
31 changes: 28 additions & 3 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ COPY build_scripts /

FROM ghcr.io/nushell/nushell:latest-alpine as nushell

FROM quay.io/fedora/fedora-bootc:42 as base
FROM quay.io/fedora/fedora-bootc:44 as base

COPY --from=nushell /usr/bin/nu /usr/bin/nu
RUN printf '/bin/nu\n/usr/bin/nu' >> /etc/shells
Expand All @@ -23,7 +23,7 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
RUN bootc container lint


FROM quay.io/fedora/fedora-kinoite:43 as desktop
FROM quay.io/fedora/fedora-kinoite:44 as desktop

COPY --from=nushell /usr/bin/nu /usr/bin/nu
RUN printf '/bin/nu\n/usr/bin/nu\n' >> /etc/shells
Expand Down Expand Up @@ -53,10 +53,35 @@ RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
RUN bootc container lint


FROM desktop as laptop
FROM quay.io/fedora/fedora-kinoite:43 as laptop

COPY dracut.conf /usr/lib/dracut/dracut.conf.d/50-custom-ostree.conf

COPY --from=nushell /usr/bin/nu /usr/bin/nu
RUN printf '/bin/nu\n/usr/bin/nu\n' >> /etc/shells

COPY yum-repos/custom.repo /etc/yum.repos.d/custom.repo

RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
--mount=type=cache,dst=/var/cache \
--mount=type=cache,dst=/var/lib/dnf \
--mount=type=tmpfs,dst=/var/log \
--mount=type=tmpfs,dst=/tmp \
/ctx/install-base.sh

RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
/ctx/clean-base.sh

RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
--mount=type=cache,dst=/var/cache \
--mount=type=cache,dst=/var/lib/dnf \
--mount=type=tmpfs,dst=/var/log \
--mount=type=tmpfs,dst=/tmp \
/ctx/install-desktop.sh

RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
/ctx/clean-desktop.sh

RUN --mount=type=bind,from=ctx,source=/,target=/ctx \
--mount=type=cache,dst=/var/cache \
--mount=type=cache,dst=/var/lib/dnf \
Expand Down