Move base files to their own directory

.gitlab-ci.yml

@@ -37,8 +37,7 @@ variables:
 base-images:
   extends:
     - .build
-  # stage: base-images
+  stage: base-images
-  stage: build
   parallel:
     matrix:
       - RECIPE:
@@ -46,16 +45,17 @@ base-images:
           - base-cosmic.yml
           - base-kinoite-nvidia.yml
           - base-cosmic-nvidia.yml
-        TAG: 519-device-or-resource-busy-when-trying-to-rechunk-the-image-in-gitlab-ci
+        # TAG: 519-device-or-resource-busy-when-trying-to-rechunk-the-image-in-gitlab-ci
-        # BB_BUILD_PUSH: 'true'
+        BB_BUILD_PUSH: 'true'
+        BB_CACHE_LAYERS: 'true'
         # BB_BUILD_RECHUNK: 'true'
 
 build-image:
   extends:
     - .build
   stage: build
-  # needs:
+  needs:
-  #   - base-images
+    - base-images
   parallel:
     matrix:
       - RECIPE:

recipes/base-cosmic-nvidia.yml

@@ -5,26 +5,5 @@ base-image: quay.io/fedora/fedora-bootc
 image-version: 42
 description: The base image of Wunker OS
 modules:
-  # Latest build
+  - from-file: base/nvidia.yml
-  - type: dnf
+  - from-file: base/common.yml
-    repos:
-      cleanup: true
-      copr:
-        - ryanabx/cosmic-epoch
-    install:
-      packages:
-        - cosmic-desktop
-
-  # Official release
-  # - type: dnf
-  #   group-install:
-  #     packages:
-  #       - cosmic-desktop-environment
-
-  # Setup cosmic greeter as DM
-  - type: systemd
-    system:
-      enabled:
-        - cosmic-greeter
-  - from-file: common/nvidia.yml
-  - from-file: common/base-common.yml

recipes/base-cosmic.yml

@@ -1,28 +1,9 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: cosmic
-base-image: ghcr.io/ublue-os/base-main
+base-image: quay.io/fedora/fedora-bootc
 image-version: 42
 description: The base image of Wunker OS
 modules:
-  - type: dnf
+  - from-file: base/cosmic.yml
-    repos:
+  - from-file: base/common.yml
-      cleanup: true
-      copr:
-        - ryanabx/cosmic-epoch
-    install:
-      packages:
-        - cosmic-desktop
-
-  # Official release
-  # - type: dnf
-  #   group-install:
-  #     packages:
-  #       - cosmic-desktop-environment
-
-  # Setup cosmic greeter as DM
-  - type: systemd
-    system:
-      enabled:
-        - cosmic-greeter
-  - from-file: common/base-common.yml

recipes/base-kinoite-nvidia.yml

@@ -1,18 +1,11 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: kinoite-nvidia
-base-image: ghcr.io/ublue-os/kinoite-main
+base-image: quay.io/fedora/fedora-bootc
 image-version: 42
 description: The base image of Wunker OS
 modules:
-  - type: dnf
+  - from-file: base/kinoite.yml
-    group-install:
+  - from-file: base/nvidia.yml
-      packages:
+  - from-file: base/common.yml
-        - kde-desktop
-  - type: systemd
-    system:
-      enabled:
-        - sddm
-  - from-file: common/nvidia.yml
-  - from-file: common/base-common.yml
 

recipes/base-kinoite.yml

@@ -1,16 +1,9 @@
 ---
 # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
 name: kinoite
-base-image: ghcr.io/ublue-os/kinoite-main
+base-image: quay.io/fedora/fedora-bootc
 image-version: 42
 description: The base image of Wunker OS
 modules:
-  - type: dnf
+  - from-file: base/kinoite.yml
-    group-install:
+  - from-file: base/common.yml
-      packages:
-        - kde-desktop
-  - type: systemd
-    system:
-      enabled:
-        - sddm
-  - from-file: common/base-common.yml

recipes/base/cosmic.yml

@@ -0,0 +1,22 @@
+modules:
+  # Latest build
+  - type: dnf
+    repos:
+      cleanup: true
+      copr:
+        - ryanabx/cosmic-epoch
+    install:
+      packages:
+        - cosmic-desktop
+
+  # Official release
+  # - type: dnf
+  #   group-install:
+  #     packages:
+  #       - cosmic-desktop-environment
+
+  # Setup cosmic greeter as DM
+  - type: systemd
+    system:
+      enabled:
+        - cosmic-greeter

recipes/base/kinoite.yml

@@ -0,0 +1,9 @@
+modules:
+  - type: dnf
+    group-install:
+      packages:
+        - kde-desktop
+  - type: systemd
+    system:
+      enabled:
+        - sddm