diff --git a/Earthfile b/Earthfile index 98efd5d..bf3acb0 100644 --- a/Earthfile +++ b/Earthfile @@ -13,11 +13,11 @@ FROM $SPECTRO_PUB_REPO/canvos/alpine-cert:v1.0.0 # Spectro Cloud and Kairos tags. ARG PE_VERSION=v4.4.4 ARG SPECTRO_LUET_VERSION=v1.3.2 -ARG KAIROS_VERSION=v3.0.14 +ARG KAIROS_VERSION=v3.1.0 ARG K3S_FLAVOR_TAG=k3s1 ARG RKE2_FLAVOR_TAG=rke2r1 ARG BASE_IMAGE_URL=quay.io/kairos -ARG OSBUILDER_VERSION=v0.201.0 +ARG OSBUILDER_VERSION=v0.300.1 ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION ARG K3S_PROVIDER_VERSION=v4.4.2 ARG KUBEADM_PROVIDER_VERSION=v4.4.1 diff --git a/rhel-core-images/Dockerfile.rhel8 b/rhel-core-images/Dockerfile.rhel8 index e9520db..8422e52 100644 --- a/rhel-core-images/Dockerfile.rhel8 +++ b/rhel-core-images/Dockerfile.rhel8 @@ -57,7 +57,7 @@ RUN uuidgen > /etc/machine-id && dnf install -y \ rsync jq && dnf clean all -COPY --from=quay.io/kairos/framework:v2.7.41 / / +COPY --from=quay.io/kairos/framework:v2.9.2 / / 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 diff --git a/rhel-fips/Dockerfile b/rhel-fips/Dockerfile index 9f1b87f..31d005c 100644 --- a/rhel-fips/Dockerfile +++ b/rhel-fips/Dockerfile @@ -6,7 +6,7 @@ ARG USERNAME ARG PASSWORD # Generate os-release file -FROM quay.io/kairos/osbuilder-tools:v0.7.11 as osbuilder +FROM quay.io/kairos/osbuilder-tools:v0.300.1 as osbuilder RUN zypper install -y gettext && zypper clean RUN mkdir /workspace COPY --from=base /etc/os-release /workspace/os-release @@ -83,7 +83,7 @@ RUN mkdir -p /run/lock && \ # Copy the os-release file to identify the OS COPY --from=osbuilder /workspace/os-release /etc/os-release -COPY --from=quay.io/kairos/framework:v2.7.41-fips / / +COPY --from=gcr.io/spectro-dev-public/nianyu/framework:v2.7.41-fips-spectro / / 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 diff --git a/slem/Dockerfile b/slem/Dockerfile index 1b2d47f..7b3b50f 100644 --- a/slem/Dockerfile +++ b/slem/Dockerfile @@ -28,7 +28,7 @@ RUN mkdir -p /run/lock RUN mkdir -p /usr/libexec RUN touch /usr/libexec/.keep -COPY --from=quay.io/kairos/framework:v2.7.41 / / +COPY --from=quay.io/kairos/framework:v2.9.2 / / 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 diff --git a/ubuntu-fips/Dockerfile b/ubuntu-fips/Dockerfile index caaa4b5..9ff5821 100644 --- a/ubuntu-fips/Dockerfile +++ b/ubuntu-fips/Dockerfile @@ -1,12 +1,12 @@ # Kairos framework packages for ubuntu fips -FROM quay.io/kairos/framework:v2.7.41-fips as kairos-fips +FROM gcr.io/spectro-dev-public/nianyu/framework:v2.7.41-fips-spectro as kairos-fips # Base ubuntu image (focal) FROM ubuntu:focal as base # Generate os-release file -FROM quay.io/kairos/osbuilder-tools:v0.200.11 as osbuilder +FROM quay.io/kairos/osbuilder-tools:v0.300.1 as osbuilder RUN zypper install -y gettext && zypper clean RUN mkdir /workspace COPY --from=base /etc/os-release /workspace/os-release