Build all images again

Go back to installing rke2 in the image
Remove other install script
2026-03-10 12:33:57 -04:00 · 2026-03-09 13:30:57 -04:00 · 2026-03-09 11:00:55 -04:00 · 2026-03-09 10:53:56 -04:00 · 2026-03-09 10:52:24 -04:00
5 changed files with 19 additions and 8 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -21,6 +21,7 @@ variables:
  BB_SIGNING_DRIVER: sigstore
  BB_BUILD_CHUNKED_OCI: 'true'
  BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '128'
+  BB_BUILD_RECHUNK_CLEAR_PLAN: 'true'
  BB_BUILD_PUSH: 'true'
  CLICOLOR_FORCE: 1
  TAG: main
--- a/recipes/common/wke.yml
+++ b/recipes/common/wke.yml
@@ -25,10 +25,6 @@ modules:
        - cryptsetup
        - device-mapper
        - fuse
-  - type: script
-    snippets:
-      - curl -sfL https://get.rke2.io | sh
-      # - cp -f /usr/share/rke2/rke2-cis-sysctl.conf /etc/sysctl.d/60-rke2-cis.conf
  - type: files
    files:
      - source: rke-common
--- a/recipes/wke-fw-desktop.yml
+++ b/recipes/wke-fw-desktop.yml
@@ -22,7 +22,11 @@ modules:
  #     packages:
  #       - ramalama
  - type: script
+    env:
+      INSTALL_RKE2_CHANNEL: latest
+      INSTALL_RKE2_TYPE: server
+      INSTALL_RKE2_SKIP_RELOAD: 'true'
    snippets:
-      # - curl -sfL https://get.rke2.io | INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true sh
-      - curl -sfL https://get.rke2.io | INSTALL_RKE2_SKIP_RELOAD=true sh
+      - curl -sfL https://get.rke2.io | sh
+      - cp -f /usr/share/rke2/rke2-cis-sysctl.conf /etc/sysctl.d/60-rke2-cis.conf
  - from-file: common/post-build.yml
--- a/recipes/wke-server.yml
+++ b/recipes/wke-server.yml
@@ -13,6 +13,11 @@ modules:
      - source: rke-server
        destination: /
  - type: script
+    env:
+      INSTALL_RKE2_CHANNEL: latest
+      INSTALL_RKE2_TYPE: server
+      INSTALL_RKE2_SKIP_RELOAD: 'true'
    snippets:
-      - curl -sfL https://get.rke2.io | INSTALL_RKE2_SKIP_RELOAD=true sh
+      - curl -sfL https://get.rke2.io | sh
+      - cp -f /usr/share/rke2/rke2-cis-sysctl.conf /etc/sysctl.d/60-rke2-cis.conf
  - from-file: common/post-build.yml
--- a/recipes/wke-worker.yml
+++ b/recipes/wke-worker.yml
@@ -9,6 +9,11 @@ alt-tags:
 modules:
  - from-file: common/wke.yml
  - type: script
+    env:
+      INSTALL_RKE2_CHANNEL: latest
+      INSTALL_RKE2_TYPE: agent
+      INSTALL_RKE2_SKIP_RELOAD: 'true'
    snippets:
-      - curl -sfL https://get.rke2.io | INSTALL_RKE2_TYPE=agent INSTALL_RKE2_SKIP_RELOAD=true sh
+      - curl -sfL https://get.rke2.io | sh
+      - cp -f /usr/share/rke2/rke2-cis-sysctl.conf /etc/sysctl.d/60-rke2-cis.conf
  - from-file: common/post-build.yml
Author	SHA1	Message	Date
Gerald Pinder	d4cfe90c4b	Build all images again	2026-03-10 12:33:57 -04:00
Gerald Pinder	b29eec5b1b	Go back to installing rke2 in the image	2026-03-09 13:30:57 -04:00
Gerald Pinder	30ad9f9a0c	Remove other install script	2026-03-09 11:00:55 -04:00
Gerald Pinder	6e0eb74ad9	comment out max layers	2026-03-09 10:53:56 -04:00
Gerald Pinder	d9d8686efb	Build without rke2 pre-installed	2026-03-09 10:52:24 -04:00