Skip to content

Commit

Permalink
PE-4442: kairos upgrade to 3.1.3 (#265)
Browse files Browse the repository at this point in the history
* PE-4442: kairos upgrade to 3.1.2

* kairos version to 3.1.3

* changing base image from spectro to quay for fips base images
  • Loading branch information
Dr-N00B authored Sep 20, 2024
1 parent 1f5c401 commit 6569a12
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ FROM $ALPINE_IMG
# Spectro Cloud and Kairos tags.
ARG PE_VERSION=v4.4.12
ARG SPECTRO_LUET_VERSION=v1.3.7
ARG KAIROS_VERSION=v3.0.14
ARG KAIROS_VERSION=v3.1.3
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.3
ARG OSBUILDER_IMAGE=quay.io/kairos/osbuilder-tools:$OSBUILDER_VERSION
ARG K3S_PROVIDER_VERSION=v4.4.2
ARG KUBEADM_PROVIDER_VERSION=v4.5.0-alpha1
Expand Down
2 changes: 1 addition & 1 deletion rhel-core-images/Dockerfile.rhel8
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.7 / /

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
Expand Down
2 changes: 1 addition & 1 deletion rhel-core-images/Dockerfile.rhel9
Original file line number Diff line number Diff line change
Expand Up @@ -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.11.7 / /

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
Expand Down
2 changes: 1 addition & 1 deletion rhel-core-images/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ This scenario is for the environment where Red Hat Satellite must be used and ac

1. Mirror base RHEL UBI image (`registry.access.redhat.com/ubi9-init:9.4-6`) to the internal Container registry. Provide image path for the build process by using argument `BASE_IMAGE`.

2. Mirror Kairos framework image (`quay.io/kairos/framework:v2.7.41`) to the internal Container registry. Provide image path for the build process by using argument `KAIROS_FRAMEWORK_IMAGE`.
2. Mirror Kairos framework image (`quay.io/kairos/framework:v2.11.7`) to the internal Container registry. Provide image path for the build process by using argument `KAIROS_FRAMEWORK_IMAGE`.

3. Have the following repostiories synced and available on Red Hat Satellite:

Expand Down
3 changes: 2 additions & 1 deletion rhel-fips/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ 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=gcr.io/spectro-images-public/kairos/framework:v2.7.41-fips-spectro / /
# COPY --from=gcr.io/spectro-images-public/kairos/framework:v2.11.7-fips / /
COPY --from=quay.io/kairos/framework:v2.11.7-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
Expand Down
2 changes: 1 addition & 1 deletion slem/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,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.11.7 / /

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
Expand Down
3 changes: 2 additions & 1 deletion ubuntu-fips/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@

# Kairos framework packages for ubuntu fips
FROM gcr.io/spectro-images-public/kairos/framework:v2.7.41-fips-spectro as kairos-fips
# FROM gcr.io/spectro-images-public/kairos/framework:v2.11.7-fips as kairos-fips
FROM quay.io/kairos/framework:v2.11.7-fips as kairos-fips

# Base ubuntu image (focal)
FROM ubuntu:focal as base
Expand Down

0 comments on commit 6569a12

Please sign in to comment.