Switch to new matrix

.gitlab-ci.yml

@@ -8,8 +8,6 @@ include:
       - RECIPE:
           - recipe-desktop.yml
           - recipe-framework-13.yml
-        CONTAINERFILE: Containerfile.j
-        USR_DIR: usr-j
-      - RECIPE: recipe-c.yml
-        CONTAINERFILE: Containerfile.c
-        USR_DIR: usr-c
+        USER: jp
+      - RECIPE: recipe-cp.yml
+        USER: cp

Containerfile.cp

@@ -11,7 +11,7 @@ ARG BASE_IMAGE_URL=ghcr.io/ublue-os/cinnamon-main
 
 FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION}
 
-ARG USR_DIR=usr-c
+ARG USR_DIR=usr-cp
 
 # The default recipe set to the recipe's default filename
 # so that `podman build` should just work for many people.

Containerfile.jp

@@ -11,7 +11,7 @@ ARG BASE_IMAGE_URL=ghcr.io/ublue-os/kinoite-main
 
 FROM ${BASE_IMAGE_URL}:${FEDORA_MAJOR_VERSION}
 
-ARG USR_DIR=usr-j
+ARG USR_DIR=usr-jp
 
 # The default recipe set to the recipe's default filename
 # so that `podman build` should just work for many people.

recipe-c.yml

@@ -1,4 +1,4 @@
-name: laptop-c
+name: laptop
 base-image: ghcr.io/ublue-os/cinnamon-main
 fedora-version: 38
 description: The image of Wunker OS for a regular Cinnaomon user.