diff --git a/Earthfile b/Earthfile index 8f7ef3a..b55754f 100644 --- a/Earthfile +++ b/Earthfile @@ -18,7 +18,7 @@ ARG RKE2_FLAVOR_TAG=rke2r1 ARG OSBUILDER_VERSION=v0.7.11 ARG OSBUILDER_IMAGE=$KAIROS_BASE_IMAGE_URL/osbuilder-tools:$OSBUILDER_VERSION ARG K3S_PROVIDER_VERSION=v4.2.1 -ARG KUBEADM_PROVIDER_VERSION=v4.2.1 +ARG KUBEADM_PROVIDER_VERSION=v4.3.0 ARG RKE2_PROVIDER_VERSION=v4.1.1 # Variables used in the builds. Update for ADVANCED use cases only Modify in .arg file or via CLI arguements @@ -45,7 +45,7 @@ ARG PROXY_CERT_PATH ARG UPDATE_KERNEL=false -ARG ETCD_VERSION="v3.5.5" +ARG ETCD_VERSION="v3.5.13" IF [ "$OS_DISTRIBUTION" = "ubuntu" ] && [ "$BASE_IMAGE" = "" ] IF [ "$OS_VERSION" == 22 ] || [ "$OS_VERSION" == 20 ] diff --git a/image.lst b/image.lst index 3b0a5b5..4db12de 100644 --- a/image.lst +++ b/image.lst @@ -1,7 +1,8 @@ -quay.io/kairos/ubuntu:22.04-core-amd64-generic-v2.4.3 -quay.io/kairos/ubuntu:22.10-core-amd64-generic-v2.4.3 -quay.io/kairos/ubuntu:23.04-core-amd64-generic-v2.4.3 -quay.io/kairos/opensuse:leap-15.5-core-amd64-generic-v2.4.3 -gcr.io/spectro-dev-public/boobalan/slem-base-image:kairos-v2.4.3 -gcr.io/spectro-dev-public/ubuntu-focal-fips:v4.2_20231226 -gcr.io/spectro-dev-public/piyush/rhel-kairos:4.3.0 \ No newline at end of file +gcr.io/spectro-images-public/ubuntu:20.04-core-amd64-generic-v2.4.5 +gcr.io/spectro-images-public/ubuntu:22.04-core-amd64-generic-v2.4.5 +gcr.io/spectro-images-public/ubuntu:23.04-core-amd64-generic-v2.4.5 +gcr.io/spectro-images-public/opensuse:leap-15.5-core-amd64-generic-v2.4.5 +gcr.io/spectro-images-public/rhel8:core-amd64-generic-v2.4.5 +gcr.io/spectro-images-public/slem:2.4.5 +gcr.io/spectro-images-public/ubuntu-focal-fips:v2.4.5 +gcr.io/spectro-images-public/rhel-fips:v2.4.5 \ No newline at end of file diff --git a/rhel-core-images/Dockerfile.rhel8 b/rhel-core-images/Dockerfile.rhel8 index c64a5fe..b0e1ad9 100644 --- a/rhel-core-images/Dockerfile.rhel8 +++ b/rhel-core-images/Dockerfile.rhel8 @@ -56,7 +56,7 @@ RUN uuidgen > /etc/machine-id && dnf install -y \ kernel kernel-modules kernel-modules-extra \ rsync jq && dnf clean all -COPY --from=quay.io/kairos/framework:v2.4.3_generic / / +COPY --from=quay.io/kairos/framework:v2.4.5 / / RUN mkdir -p /run/lock RUN touch /usr/libexec/.keep diff --git a/rhel-fips/Dockerfile b/rhel-fips/Dockerfile index edf8301..55289f7 100644 --- a/rhel-fips/Dockerfile +++ b/rhel-fips/Dockerfile @@ -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.4.3_fips / / +COPY --from=quay.io/kairos/framework:v2.4.5-fips / / COPY overlay/rhel8 / diff --git a/slem/Dockerfile b/slem/Dockerfile index 31ca407..c19a09f 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.4.3_generic / / +COPY --from=quay.io/kairos/framework:v2.4.5 / / # 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 index e3d02d7..67dae7e 100644 --- a/ubuntu-fips/Dockerfile +++ b/ubuntu-fips/Dockerfile @@ -1,6 +1,6 @@ # Kairos framework packages for ubuntu fips -FROM quay.io/kairos/framework:v2.4.3_fips as kairos-fips +FROM quay.io/kairos/framework:v2.4.5-fips as kairos-fips # Base ubuntu image (focal) FROM ubuntu:focal as base