Skip to content
This repository has been archived by the owner on Oct 18, 2024. It is now read-only.

Commit

Permalink
feat: swap out custom build for RPM of vanilla-first-setup (#59)
Browse files Browse the repository at this point in the history
  • Loading branch information
castrojo authored Feb 14, 2023
1 parent 84340a2 commit 6927892
Showing 1 changed file with 5 additions and 22 deletions.
27 changes: 5 additions & 22 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -1,38 +1,21 @@
# Multi-stage build
ARG FEDORA_MAJOR_VERSION=37

## Build vanilla-first-setup
FROM ubuntu:22.04 AS build

RUN apt-get update && apt-get install -y \
build-essential meson libadwaita-1-dev \
gettext desktop-file-utils git

# Checkout the last tested/known working commit, in liu of an upstream release
RUN git clone https://github.com/Vanilla-OS/first-setup.git && \
cd first-setup && git checkout bf21de5
WORKDIR first-setup
RUN meson build --prefix /usr && ninja -C build
RUN DESTDIR=/opt ninja -C build install
RUN tar cfz vanilla-first-setup.tar.gz /opt

## Build ublue-os-base
FROM quay.io/fedora-ostree-desktops/silverblue:${FEDORA_MAJOR_VERSION}
# See https://pagure.io/releng/issue/11047 for final location

## Install the VanillaOS first-setup utility
COPY --from=build /first-setup/vanilla-first-setup.tar.gz /
RUN tar xf vanilla-first-setup.tar.gz --strip-component=1 -C / && \
chmod +x /usr/bin/vanilla-first-setup && \
ostree container commit
# Add Vanilla First Setup
RUN wget https://copr.fedorainfracloud.org/coprs/ublue-os/vanilla-first-setup/repo/fedora-$(rpm -E %fedora)/ublue-os-vanilla-first-setup-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ublue-os-vanilla-first-setup.repo

COPY etc /etc

COPY ublue-firstboot /usr/bin

RUN rpm-ostree override remove firefox firefox-langpacks && \
rpm-ostree install distrobox gnome-tweaks just vte291-gtk4-devel && \
rpm-ostree install distrobox gnome-tweaks just vte291-gtk4-devel vanilla-first-setup && \
sed -i 's/#AutomaticUpdatePolicy.*/AutomaticUpdatePolicy=stage/' /etc/rpm-ostreed.conf && \
systemctl enable rpm-ostreed-automatic.timer && \
systemctl enable flatpak-automatic.timer && \
ostree container commit
rm -f /etc/yum.repos.d/_copr_ublue-os-vanilla-first-setup.repo && \
ostree container commit

0 comments on commit 6927892

Please sign in to comment.