From 43ddf0a123911f9dedc3a76dcfc314a7cb37e871 Mon Sep 17 00:00:00 2001
From: Adam Israel <adam@adamisrael.com>
Date: Sun, 12 Feb 2023 13:48:22 -0500
Subject: [PATCH] feat: Install VanillaOS' first-setup (#55)

---
 Containerfile | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/Containerfile b/Containerfile
index 150c08fef4..535f0f6a33 100644
--- a/Containerfile
+++ b/Containerfile
@@ -1,8 +1,31 @@
+# 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
+
 COPY etc /etc
 
 COPY ublue-firstboot /usr/bin