From 49e65bd3266fad6c4be93cef9f1d35f3e34c1312 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivo=20Damjanovi=C4=87?= <ivo@damjanovic.it>
Date: Sat, 10 Aug 2024 20:33:28 +0200
Subject: [PATCH 1/2] feat: add ublue-os:config as config

feat: add ublue-os:config as config
---
 Containerfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Containerfile b/Containerfile
index 86e4636..70799bc 100644
--- a/Containerfile
+++ b/Containerfile
@@ -3,9 +3,13 @@ ARG SOURCE_ORG="${SOURCE_ORG:-ghcr.io/ublue-os}"
 ARG BASE_IMAGE="${SOURCE_ORG}/${SOURCE_IMAGE}"
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 
+FROM ghcr.io/ublue-os/config:latest as config
+
 FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION}
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 
+COPY --from=config /rpms /tmp/rpms
+
 # Build in one step
 RUN if [[ "${FEDORA_MAJOR_VERSION}" == "rawhide" ]]; then \
         curl -Lo /etc/yum.repos.d/_copr_ryanabx-cosmic.repo \
@@ -17,6 +21,8 @@ RUN if [[ "${FEDORA_MAJOR_VERSION}" == "rawhide" ]]; then \
         cosmic-desktop && \
     rpm-ostree install \
         gnome-keyring NetworkManager-tui && \
+    rpm-ostree install \
+        /tmp/rpms/*.rpm
     systemctl disable gdm || true && \
     systemctl disable sddm || true && \
     systemctl enable cosmic-greeter && \

From 011e378f8f180647ece4cc0119afc45f51fa3ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ivo=20Damjanovi=C4=87?= <ivo@damjanovic.it>
Date: Sat, 10 Aug 2024 21:08:01 +0200
Subject: [PATCH 2/2] fix: add ublue-os:config as config

---
 Containerfile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Containerfile b/Containerfile
index 70799bc..a8467de 100644
--- a/Containerfile
+++ b/Containerfile
@@ -8,7 +8,8 @@ FROM ghcr.io/ublue-os/config:latest as config
 FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION}
 ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-40}"
 
-COPY --from=config /rpms /tmp/rpms
+COPY --from=ghcr.io/ublue-os/config:latest /files/ublue-os/udev-rules /
+COPY --from=ghcr.io/ublue-os/config:latest /files/ublue-os/update-services /
 
 # Build in one step
 RUN if [[ "${FEDORA_MAJOR_VERSION}" == "rawhide" ]]; then \
@@ -21,8 +22,6 @@ RUN if [[ "${FEDORA_MAJOR_VERSION}" == "rawhide" ]]; then \
         cosmic-desktop && \
     rpm-ostree install \
         gnome-keyring NetworkManager-tui && \
-    rpm-ostree install \
-        /tmp/rpms/*.rpm
     systemctl disable gdm || true && \
     systemctl disable sddm || true && \
     systemctl enable cosmic-greeter && \