kairos upgrade to v3.0.9 and ubuntu-fips snapd remove (#179)

spectrocloud · May 3, 2024 · 9bcb4f7 · 9bcb4f7
1 parent b04a63d
commit 9bcb4f7
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 2 deletions.
diff --git a/Earthfile b/Earthfile
@@ -13,7 +13,7 @@ FROM $SPECTRO_PUB_REPO/canvos/alpine-cert:v1.0.0
 ## Spectro Cloud and Kairos Tags ##
 ARG PE_VERSION=v4.3.2
 ARG SPECTRO_LUET_VERSION=v1.2.7
-ARG KAIROS_VERSION=v3.0.8
+ARG KAIROS_VERSION=v3.0.9
 ARG K3S_FLAVOR_TAG=k3s1
 ARG RKE2_FLAVOR_TAG=rke2r1
 ARG BASE_IMAGE_URL=quay.io/kairos

diff --git a/rhel-core-images/Dockerfile.rhel8 b/rhel-core-images/Dockerfile.rhel8
@@ -59,6 +59,10 @@ RUN uuidgen > /etc/machine-id && dnf install -y \
 
 COPY --from=quay.io/kairos/framework:v2.7.31 / /
 
+RUN sed -i 's/\bsource\b/./g' /system/oem/00_rootfs.yaml
+RUN sed -i 's/\bsource\b/./g' /system/oem/09_openrc_services.yaml
+RUN sed -i 's/\bsource\b/./g' /system/oem/50_recovery.yaml
+
 RUN mkdir -p /run/lock
 RUN touch /usr/libexec/.keep
 

diff --git a/rhel-fips/Dockerfile b/rhel-fips/Dockerfile
@@ -86,6 +86,10 @@ COPY --from=osbuilder /workspace/os-release /etc/os-release
 
 COPY --from=quay.io/kairos/framework:v2.7.31-fips / /
 
+RUN sed -i 's/\bsource\b/./g' /system/oem/00_rootfs.yaml
+RUN sed -i 's/\bsource\b/./g' /system/oem/09_openrc_services.yaml
+RUN sed -i 's/\bsource\b/./g' /system/oem/50_recovery.yaml
+
 COPY overlay/rhel8 /
 
 # Configure the box. The ubi image masks services for containers, we unmask them 

diff --git a/slem/Dockerfile b/slem/Dockerfile
@@ -30,6 +30,11 @@ RUN touch /usr/libexec/.keep
 
 COPY --from=quay.io/kairos/framework:v2.7.31 / /
 
+RUN sed -i 's/\bsource\b/./g' /system/oem/00_rootfs.yaml
+RUN sed -i 's/\bsource\b/./g' /system/oem/09_openrc_services.yaml
+RUN sed -i 's/\bsource\b/./g' /system/oem/50_recovery.yaml
+
+
 # Remove file below to allow dracut to build initrd without dhcp-client
 RUN rm -rf /usr/lib/dracut/modules.d/35network-legacy
 

diff --git a/ubuntu-fips/Dockerfile b/ubuntu-fips/Dockerfile
@@ -99,7 +99,6 @@ RUN apt-get install -y --no-install-recommends \
     qemu-guest-agent \
     rsync \
     shared-mime-info \
-    snapd \
     snmpd \
     squashfs-tools \
     sudo \
@@ -119,6 +118,11 @@ RUN apt-get install -y --no-install-recommends \
 
 # Copy the Kairos framework files. We use master builds here for fedora. See https://quay.io/repository/kairos/framework?tab=tags for a list
 COPY --from=kairos-fips / /
+
+RUN sed -i 's/\bsource\b/./g' /system/oem/00_rootfs.yaml
+RUN sed -i 's/\bsource\b/./g' /system/oem/09_openrc_services.yaml
+RUN sed -i 's/\bsource\b/./g' /system/oem/50_recovery.yaml
+
 # Copy the os-release file to identify the OS
 COPY --from=osbuilder /workspace/os-release /etc/os-release