Create combo recipe

This commit is contained in:
2025-09-10 18:18:33 -04:00
parent e2050c9f34
commit bfdc959289
5 changed files with 30 additions and 6 deletions

View File

@@ -19,6 +19,7 @@ variables:
DOCKER_CERT_PATH: $DOCKER_TLS_CERTDIR/client DOCKER_CERT_PATH: $DOCKER_TLS_CERTDIR/client
RUST_LOG_STYLE: always RUST_LOG_STYLE: always
BB_SIGNING_DRIVER: sigstore BB_SIGNING_DRIVER: sigstore
BB_CACHE_LAYERS: 'true'
CLICOLOR_FORCE: 1 CLICOLOR_FORCE: 1
TAG: main TAG: main
@@ -42,12 +43,14 @@ base-images:
matrix: matrix:
- RECIPE: - RECIPE:
# - base-cosmic.yml # - base-cosmic.yml
- base-cosmic-nvidia.yml # - base-cosmic-nvidia.yml
# - base-combo.yml
- base-combo-nvidia.yml
# - base-kinoite.yml # - base-kinoite.yml
# - base-kinoite-nvidia.yml # - base-kinoite-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_BUILD_RECHUNK: 'true' # BB_BUILD_RECHUNK: 'true'
build-image: build-image:
extends: extends:
@@ -59,9 +62,10 @@ build-image:
matrix: matrix:
- RECIPE: - RECIPE:
- cp-laptop.yml - cp-laptop.yml
- jp-desktop-nvidia.yml
- wke-server.yml - wke-server.yml
- wke-worker.yml - wke-worker.yml
BB_BUILD_PUSH: 'true'
- RECIPE:
- jp-desktop-nvidia.yml
- jp-laptop.yml - jp-laptop.yml
BB_CACHE_LAYERS: 'true'
# BB_BUILD_PUSH: 'true' # BB_BUILD_PUSH: 'true'

View File

@@ -0,0 +1,10 @@
---
# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
name: combo
base-image: quay.io/fedora/fedora-bootc
image-version: 42
description: The base image of Wunker OS with COSMIC and Plasma for Nvidia
modules:
- from-file: base/common.yml
- from-file: base/cosmic.yml
- from-file: base/post-build.yml

10
recipes/base-combo.yml Normal file
View File

@@ -0,0 +1,10 @@
---
# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json
name: combo
base-image: quay.io/fedora/fedora-bootc
image-version: 42
description: The base image of Wunker OS with COSMIC and Plasma
modules:
- from-file: base/common.yml
- from-file: base/cosmic.yml
- from-file: base/post-build.yml

View File

@@ -6,7 +6,7 @@ name: jp-desktop-nvidia
# image-version: "42.20250828.1" # image-version: "42.20250828.1"
# Custom Base # Custom Base
base-image: registry.gitlab.com/wunker-bunker/wunker-os/cosmic-nvidia base-image: registry.gitlab.com/wunker-bunker/wunker-os/combo-nvidia
image-version: 42 image-version: 42
description: The image of Wunker OS for JP's desktop gaming. description: The image of Wunker OS for JP's desktop gaming.
blue-build-tag: none blue-build-tag: none

View File

@@ -3,7 +3,7 @@
name: jp-laptop name: jp-laptop
# base-image: ghcr.io/ublue-os/bazzite # base-image: ghcr.io/ublue-os/bazzite
# image-version: "42.20250828" # image-version: "42.20250828"
base-image: registry.gitlab.com/wunker-bunker/wunker-os/cosmic base-image: registry.gitlab.com/wunker-bunker/wunker-os/combo
image-version: 42 image-version: 42
description: The image of Wunker OS for JP's Laptop. description: The image of Wunker OS for JP's Laptop.
stages: stages: