diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1b22788..90bfd89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,8 +23,8 @@ build-image: - cp-laptop.yml - jp-desktop-nvidia.yml - jp-laptop.yml - - jp-minis-worker.yml - - jp-minis-server.yml + - wke-server.yml + - wke-worker.yml variables: DOCKER_HOST: tcp://docker:2376 DOCKER_TLS_CERTDIR: /certs diff --git a/recipes/common/jp-minis.yml b/recipes/common/wke.yml similarity index 96% rename from recipes/common/jp-minis.yml rename to recipes/common/wke.yml index 9397909..a7437c8 100644 --- a/recipes/common/jp-minis.yml +++ b/recipes/common/wke.yml @@ -3,7 +3,6 @@ modules: - from-file: common/updates.yml - from-file: common/bluebuild-logo.yml - from-file: common/jp-chezmoi.yml - - from-file: common/docker-engine.yml - type: dnf repos: cleanup: true diff --git a/recipes/jp-minis-server.yml b/recipes/wke-server.yml similarity index 78% rename from recipes/jp-minis-server.yml rename to recipes/wke-server.yml index 7c0cc4b..28adb70 100644 --- a/recipes/jp-minis-server.yml +++ b/recipes/wke-server.yml @@ -1,18 +1,19 @@ --- # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json -name: jp-minis-server -# base-image: ghcr.io/ublue-os/kinoite-nvidia +name: wke base-image: ghcr.io/ublue-os/base-main image-version: 42 description: The image of Wunker OS for RKE2 Server +alt-tags: + - server modules: - type: os-release source: local properties: NAME: WunkerOS ID: wunker_os - PRETTY_NAME: Wunker OS RKE2 Server - - from-file: common/jp-minis.yml + PRETTY_NAME: WKE Server + - from-file: common/wke.yml - type: files files: - source: rke-server diff --git a/recipes/jp-minis-worker.yml b/recipes/wke-worker.yml similarity index 76% rename from recipes/jp-minis-worker.yml rename to recipes/wke-worker.yml index b1dcef7..6d61f0b 100644 --- a/recipes/jp-minis-worker.yml +++ b/recipes/wke-worker.yml @@ -1,18 +1,19 @@ --- # yaml-language-server: $schema=https://schema.blue-build.org/recipe-v1.json -name: jp-minis-worker -# base-image: ghcr.io/ublue-os/kinoite-nvidia +name: wke base-image: ghcr.io/ublue-os/base-main image-version: 42 description: The image of Wunker OS for RKE2 Worker +alt-tags: + - worker modules: - type: os-release source: local properties: NAME: WunkerOS ID: wunker_os - PRETTY_NAME: Wunker OS RKE2 Worker - - from-file: common/jp-minis.yml + PRETTY_NAME: WKE Worker + - from-file: common/wke.yml - type: script snippets: - curl -sfL https://get.rke2.io | INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true sh