From 6fd7109cdc76f5c6689eb41a67d8fd21aabdaf1f Mon Sep 17 00:00:00 2001 From: Gerald Pinder <4626052+gmpinder@users.noreply.github.com> Date: Sat, 17 May 2025 17:11:17 -0400 Subject: [PATCH] Build separate images --- .gitlab-ci.yml | 3 ++- recipes/{jp-minis.yml => jp-minis-server.yml} | 5 ++++- recipes/jp-minis-worker.yml | 13 +++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) rename recipes/{jp-minis.yml => jp-minis-server.yml} (72%) create mode 100644 recipes/jp-minis-worker.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5818eac..1b22788 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,8 @@ build-image: - cp-laptop.yml - jp-desktop-nvidia.yml - jp-laptop.yml - - jp-minis.yml + - jp-minis-worker.yml + - jp-minis-server.yml variables: DOCKER_HOST: tcp://docker:2376 DOCKER_TLS_CERTDIR: /certs diff --git a/recipes/jp-minis.yml b/recipes/jp-minis-server.yml similarity index 72% rename from recipes/jp-minis.yml rename to recipes/jp-minis-server.yml index d2a420e..e8a86c9 100644 --- a/recipes/jp-minis.yml +++ b/recipes/jp-minis-server.yml @@ -1,10 +1,13 @@ --- # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json -name: jp-minis +name: jp-minis-server # base-image: ghcr.io/ublue-os/kinoite-nvidia base-image: ghcr.io/ublue-os/base-main image-version: 42 description: The image of Wunker OS for JP's Minisforum PCs. modules: - from-file: common/jp-minis.yml + - type: script + snippets: + - INSTALL_RKE2_SKIP_RELOAD=true curl -sfL https://get.rke2.io | sh - from-file: common/post-build.yml diff --git a/recipes/jp-minis-worker.yml b/recipes/jp-minis-worker.yml new file mode 100644 index 0000000..e4c377a --- /dev/null +++ b/recipes/jp-minis-worker.yml @@ -0,0 +1,13 @@ +--- +# yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json +name: jp-minis-worker +# base-image: ghcr.io/ublue-os/kinoite-nvidia +base-image: ghcr.io/ublue-os/base-main +image-version: 42 +description: The image of Wunker OS for JP's Minisforum PCs. +modules: + - from-file: common/jp-minis.yml + - type: script + snippets: + - INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true curl -sfL https://get.rke2.io | sh + - from-file: common/post-build.yml