d

ublue-os · Feb 18, 2024 · 95bb330 · 95bb330
1 parent 0cb6ee3
commit 95bb330
Showing 1 changed file with 62 additions and 17 deletions.
diff --git a/containers/fedora-cosmic-atomic-silverblue/Containerfile b/containers/fedora-cosmic-atomic-silverblue/Containerfile
@@ -1,7 +1,53 @@
 ARG IMAGE_MAJOR_VERSION=39
 ARG BASE_IMAGE_URL=quay.io/fedora/fedora-silverblue
 
-FROM ghcr.io/ryanabx/fedora-cosmic-artifacts:latest-amd64 AS cosmic-builder
+FROM registry.fedoraproject.org/fedora:${IMAGE_MAJOR_VERSION} AS cosmic-builder
+
+RUN dnf update -y
+RUN dnf install -y  git \
+                    make \
+                    which \
+                    just \
+                    rustc \
+                    libglvnd-devel \
+                    libseat-devel \
+                    libxkbcommon-devel \
+                    lld \
+                    libinput-devel \
+                    glib2-devel \
+                    gtk3-devel \
+                    dbus-devel \
+                    wayland-devel \
+                    clang-devel \
+                    cargo \
+                    mesa-libgbm-devel \
+                    pipewire-devel \
+                    pam-devel \
+                    flatpak-devel \
+                    rust-rav1e+nasm-rs-devel
+RUN git clone -b ryanabx-master --recurse-submodules https://github.com/ryanabx/cosmic-epoch
+# This is where the magic happens
+RUN cd cosmic-epoch && git submodule update --remote && just sysext && rm -rf cosmic-sysext/usr/lib/extension-release.d
+
+
+FROM registry.fedoraproject.org/fedora:${IMAGE_MAJOR_VERSION} AS launcher-builder
+
+RUN dnf update -y
+RUN dnf install -y  git \
+                    just \
+                    rustc \
+                    cargo \
+                    libglvnd-devel \
+                    libxkbcommon-devel
+RUN git clone --recurse-submodules https://github.com/pop-os/launcher
+RUN cd launcher && just build-release
+
+
+FROM registry.fedoraproject.org/fedora:${IMAGE_MAJOR_VERSION} AS wallpapers-builder
+RUN dnf update -y
+RUN dnf install -y  git 
+RUN git clone --recurse-submodules https://github.com/pop-os/system76-wallpapers
+
 
 FROM ${BASE_IMAGE_URL}:${IMAGE_MAJOR_VERSION}
 
@@ -16,38 +62,37 @@ RUN rpm-ostree install \
         mozilla-fira-mono-fonts \
         mozilla-fira-sans-fonts
 
-# Copy COSMIC to base-main
+# Copy COSMIC
 COPY --from=cosmic-builder /cosmic-epoch/cosmic-sysext/usr /usr
 COPY --from=cosmic-builder /cosmic-epoch/cosmic-comp/config.ron /usr/etc/cosmic-comp/config.ron
 COPY --from=cosmic-builder /cosmic-epoch/cosmic-greeter/cosmic-greeter.toml /usr/etc/greetd/cosmic-greeter.toml
 COPY --from=cosmic-builder /cosmic-epoch/cosmic-greeter/debian/cosmic-greeter.service /usr/lib/systemd/system/cosmic-greeter.service
 
-COPY --from=cosmic-builder /launcher/target/release/pop-launcher-bin /usr/bin/pop-launcher
-COPY --from=cosmic-builder /launcher/plugins/src/calc/plugin.ron /usr/lib/pop-launcher/plugins/calc/plugin.ron
+COPY --from=launcher-builder /launcher/target/release/pop-launcher-bin /usr/bin/pop-launcher
+COPY --from=launcher-builder /launcher/plugins/src/calc/plugin.ron /usr/lib/pop-launcher/plugins/calc/plugin.ron
 RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/calc/calc
-COPY --from=cosmic-builder /launcher/plugins/src/cosmic_toplevel/plugin.ron /usr/lib/pop-launcher/plugins/cosmic_toplevel/plugin.ron
+COPY --from=launcher-builder /launcher/plugins/src/cosmic_toplevel/plugin.ron /usr/lib/pop-launcher/plugins/cosmic_toplevel/plugin.ron
 RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/cosmic_toplevel/cosmic-toplevel
-COPY --from=cosmic-builder /launcher/plugins/src/desktop_entries/plugin.ron /usr/lib/pop-launcher/plugins/desktop_entries/plugin.ron
+COPY --from=launcher-builder /launcher/plugins/src/desktop_entries/plugin.ron /usr/lib/pop-launcher/plugins/desktop_entries/plugin.ron
 RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/desktop_entries/desktop-entries
-COPY --from=cosmic-builder /launcher/plugins/src/files/plugin.ron /usr/lib/pop-launcher/plugins/files/plugin.ron
+COPY --from=launcher-builder /launcher/plugins/src/files/plugin.ron /usr/lib/pop-launcher/plugins/files/plugin.ron
 RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/files/files
-COPY --from=cosmic-builder /launcher/plugins/src/find/plugin.ron /usr/lib/pop-launcher/plugins/find/plugin.ron
+COPY --from=launcher-builder /launcher/plugins/src/find/plugin.ron /usr/lib/pop-launcher/plugins/find/plugin.ron
 RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/find/find
-COPY --from=cosmic-builder /launcher/plugins/src/pulse/plugin.ron /usr/lib/pop-launcher/plugins/pulse/plugin.ron
+COPY --from=launcher-builder /launcher/plugins/src/pulse/plugin.ron /usr/lib/pop-launcher/plugins/pulse/plugin.ron
 RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/pulse/pulse
-COPY --from=cosmic-builder /launcher/plugins/src/recent/plugin.ron /usr/lib/pop-launcher/plugins/recent/plugin.ron
+COPY --from=launcher-builder /launcher/plugins/src/recent/plugin.ron /usr/lib/pop-launcher/plugins/recent/plugin.ron
 RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/recent/recent
-COPY --from=cosmic-builder /launcher/plugins/src/scripts/plugin.ron /usr/lib/pop-launcher/plugins/scripts/plugin.ron
+COPY --from=launcher-builder /launcher/plugins/src/scripts/plugin.ron /usr/lib/pop-launcher/plugins/scripts/plugin.ron
 RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/scripts/scripts
-COPY --from=cosmic-builder /launcher/plugins/src/terminal/plugin.ron /usr/lib/pop-launcher/plugins/terminal/plugin.ron
+COPY --from=launcher-builder /launcher/plugins/src/terminal/plugin.ron /usr/lib/pop-launcher/plugins/terminal/plugin.ron
 RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/terminal/terminal
-COPY --from=cosmic-builder /launcher/plugins/src/web/plugin.ron /usr/lib/pop-launcher/plugins/web/plugin.ron
+COPY --from=launcher-builder /launcher/plugins/src/web/plugin.ron /usr/lib/pop-launcher/plugins/web/plugin.ron
 RUN ln -s /usr/bin/pop-launcher /usr/lib/pop-launcher/plugins/web/web
 
-# COPY --from=cosmic-builder /system76-wallpapers/backgrounds /usr/share/backgrounds/pop
+COPY --from=wallpapers-builder /system76-wallpapers/backgrounds /usr/share/backgrounds/pop
 
-# RUN ln -s /usr/lib/systemd/system/cosmic-greeter.service /etc/systemd/system/display-manager.service
+RUN ln -s /usr/lib/systemd/system/cosmic-greeter.service /etc/systemd/system/display-manager.service
 RUN rm -rf /var/lib/greetd
 
-RUN rpm-ostree cleanup -m && ostree container commit
-
+RUN rpm-ostree cleanup -m && ostree container commit