Build images as they were before

ublue-os · Feb 22, 2024 · 1cde790 · 1cde790
1 parent 95fa499
commit 1cde790
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 205 deletions.
diff --git a/.github/workflows/build_everything.yml → .github/workflows/build_images.yml b/.github/workflows/build_everything.yml → .github/workflows/build_images.yml
@@ -1,8 +1,5 @@
 name: build_images
 on:
-  workflow_run:
-      workflows: ['compile']
-      types: [completed]
   workflow_dispatch:
 
 env:

diff --git a/.github/workflows/compile.yml b/.github/workflows/compile.yml
diff --git a/containers/cosmic-desktop-compiled/Containerfile b/containers/cosmic-desktop-compiled/Containerfile
diff --git a/containers/cosmic-desktop-compiled/desc.yml b/containers/cosmic-desktop-compiled/desc.yml
diff --git a/containers/fedora-cosmic-atomic-silverblue-40/Containerfile b/containers/fedora-cosmic-atomic-silverblue-40/Containerfile
@@ -1,8 +1,36 @@
 ARG IMAGE_MAJOR_VERSION=40
 ARG BASE_IMAGE_URL=quay.io/fedora/fedora-silverblue
-ARG COMPILED_COSMIC=ghcr.io/ryanabx/cosmic-desktop-compiled
 
-FROM COMPILED_COSMIC as cosmic-compiled
+FROM registry.fedoraproject.org/fedora:40 as cosmic-compiled
+
+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 --recurse-submodules https://github.com/pop-os/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 && cd ..
+
+RUN git clone --recurse-submodules https://github.com/pop-os/launcher
+RUN cd launcher && just build-release && cd ..
 
 FROM ${BASE_IMAGE_URL}:${IMAGE_MAJOR_VERSION}
 

diff --git a/containers/fedora-cosmic-atomic-silverblue/Containerfile b/containers/fedora-cosmic-atomic-silverblue/Containerfile
@@ -1,8 +1,36 @@
 ARG IMAGE_MAJOR_VERSION=39
 ARG BASE_IMAGE_URL=quay.io/fedora/fedora-silverblue
-ARG COMPILED_COSMIC=ghcr.io/ryanabx/cosmic-desktop-compiled
 
-FROM COMPILED_COSMIC as cosmic-compiled
+FROM registry.fedoraproject.org/fedora:39 as cosmic-compiled
+
+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 --recurse-submodules https://github.com/pop-os/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 && cd ..
+
+RUN git clone --recurse-submodules https://github.com/pop-os/launcher
+RUN cd launcher && just build-release && cd ..
 
 FROM ${BASE_IMAGE_URL}:${IMAGE_MAJOR_VERSION}
 

diff --git a/containers/fedora-cosmic-atomic/Containerfile b/containers/fedora-cosmic-atomic/Containerfile
@@ -1,8 +1,36 @@
 ARG IMAGE_MAJOR_VERSION=39
 ARG BASE_IMAGE_URL=quay.io/fedora-ostree-desktops/base
-ARG COMPILED_COSMIC=ghcr.io/ryanabx/cosmic-desktop-compiled
 
-FROM COMPILED_COSMIC as cosmic-compiled
+FROM registry.fedoraproject.org/fedora:39 as cosmic-compiled
+
+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 --recurse-submodules https://github.com/pop-os/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 && cd ..
+
+RUN git clone --recurse-submodules https://github.com/pop-os/launcher
+RUN cd launcher && just build-release && cd ..
 
 FROM ${BASE_IMAGE_URL}:${IMAGE_MAJOR_VERSION}