2678890be6
* feat: FROM quay.io/fedora-ostree-desktops/kinoite Instead of using the ublue-os/kinoite-main base image we would be using the ones built by Timothée over at https://gitlab.com/fedora/ostree/ci-test This is a good path forward for Aurora because: - we no longer have to undo things we inherit from ublue-os/main - less overall dependencies - we can make more conscious decisions about what goes into the image - it's easier now to build images on top of upcoming Fedora versions (even KDE nightly ones) or to base on top of potential future images that are more aligned with our goals and needs This would come at the cost of maintaining most of what main did previously ourselves. * chore: remove ublue-os-akmods-addons * chore: codecs from negativo * feat: add flathub * fix: fedora flatpak be gone * feat: miscellaneous workarounds * feat: CoreOS rescue boot generator * feat: allow brew programs with sudo * chore: re-add packages from main * chore: remove packages we removed in main * chore: renovate there is no latest tag * fix: remove explicit ublue akmods copr cleanup already included with all the others * chore: remove added fedora flatpak service We don't need this * fix(renovate): set proper tag --------- Co-authored-by: inffy <10782843+inffy@users.noreply.github.com>
55 lines
1.6 KiB
Docker
55 lines
1.6 KiB
Docker
ARG BASE_IMAGE_NAME="kinoite"
|
|
ARG FEDORA_MAJOR_VERSION="43"
|
|
ARG SOURCE_IMAGE="${BASE_IMAGE_NAME}"
|
|
ARG BASE_IMAGE="quay.io/fedora-ostree-desktops/${SOURCE_IMAGE}"
|
|
ARG COMMON_IMAGE="ghcr.io/get-aurora-dev/common:latest"
|
|
ARG COMMON_IMAGE_SHA=""
|
|
ARG BREW_IMAGE="ghcr.io/ublue-os/brew:latest"
|
|
ARG BREW_IMAGE_SHA=""
|
|
|
|
FROM ${COMMON_IMAGE}@${COMMON_IMAGE_SHA} AS common
|
|
FROM ${BREW_IMAGE}@${BREW_IMAGE_SHA} AS brew
|
|
|
|
FROM scratch AS ctx
|
|
COPY /build_files /build_files
|
|
COPY /iso_files /iso_files
|
|
|
|
# https://github.com/get-aurora-dev/common
|
|
COPY --from=common /logos /system_files/shared
|
|
COPY --from=common /system_files /system_files
|
|
COPY --from=common /wallpapers /system_files/shared
|
|
|
|
# https://github.com/ublue-os/brew
|
|
COPY --from=brew /system_files /system_files/shared
|
|
|
|
# Overwrite files from common if necessary
|
|
COPY /system_files /system_files
|
|
|
|
## aurora image section
|
|
FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS base
|
|
|
|
ARG AKMODS_FLAVOR="coreos-stable"
|
|
ARG BASE_IMAGE_NAME="kinoite"
|
|
ARG FEDORA_MAJOR_VERSION="41"
|
|
ARG IMAGE_NAME="aurora"
|
|
ARG IMAGE_VENDOR="ublue-os"
|
|
ARG KERNEL="6.14.4-200.fc41.x86_64"
|
|
ARG SHA_HEAD_SHORT="dedbeef"
|
|
ARG UBLUE_IMAGE_TAG="stable"
|
|
ARG VERSION=""
|
|
ARG IMAGE_FLAVOR=""
|
|
|
|
# Build, cleanup, lint.
|
|
RUN --mount=type=tmpfs,dst=/boot \
|
|
--mount=type=bind,from=ctx,source=/,target=/ctx \
|
|
--mount=type=secret,id=GITHUB_TOKEN \
|
|
/ctx/build_files/shared/build.sh
|
|
|
|
# Makes `/opt` writeable by default
|
|
# Needs to be here to make the main image build strict (no /opt there)
|
|
# This is for downstream images/stuff like k0s
|
|
RUN rm -rf /opt && ln -s /var/opt /opt
|
|
|
|
CMD ["/sbin/init"]
|
|
|
|
RUN bootc container lint
|