Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PE-3397: update kairos version to v3.0.13 #215

Merged
merged 4 commits into from
Jun 24, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Earthfile
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ FROM $SPECTRO_PUB_REPO/canvos/alpine-cert:v1.0.0
# Spectro Cloud and Kairos tags.
ARG PE_VERSION=v4.4.1
ARG SPECTRO_LUET_VERSION=v1.3.1
ARG KAIROS_VERSION=v3.0.11
ARG KAIROS_VERSION=v3.0.13
ARG K3S_FLAVOR_TAG=k3s1
ARG RKE2_FLAVOR_TAG=rke2r1
ARG BASE_IMAGE_URL=quay.io/kairos
2 changes: 1 addition & 1 deletion rhel-core-images/Dockerfile.rhel8
Original file line number Diff line number Diff line change
@@ -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.33 / /
COPY --from=quay.io/kairos/framework:v2.7.39 / /

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
4 changes: 2 additions & 2 deletions rhel-fips/Dockerfile
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ RUN mkdir /workspace
COPY --from=base /etc/os-release /workspace/os-release
# You should change the following values according to your own versioning and other details
RUN OS_NAME=kairos-core-rhel-fips \
OS_VERSION=v3.0.11 \
OS_VERSION=v3.0.13 \
OS_ID="kairos" \
BUG_REPORT_URL="https://github.com/spectrocloud/pxke-samples/issues" \
HOME_URL="https://github.com/spectrocloud/pxke-samples" \
@@ -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.33-fips / /
COPY --from=quay.io/kairos/framework:v2.7.39-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
2 changes: 1 addition & 1 deletion slem/Dockerfile
Original file line number Diff line number Diff line change
@@ -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.33 / /
COPY --from=quay.io/kairos/framework:v2.7.39 / /

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

# Kairos framework packages for ubuntu fips
FROM quay.io/kairos/framework:v2.7.33-fips as kairos-fips
FROM quay.io/kairos/framework:v2.7.39-fips as kairos-fips

# Base ubuntu image (focal)
FROM ubuntu:focal as base
@@ -12,7 +12,7 @@ RUN mkdir /workspace
COPY --from=base /etc/os-release /workspace/os-release
# You should change the following values according to your own versioning and other details
RUN OS_NAME=kairos-core-ubuntu-fips \
OS_VERSION=v3.0.11 \
OS_VERSION=v3.0.13 \
OS_ID="ubuntu" \
BUG_REPORT_URL="https://github.com/spectrocloud/ubuntu-fips-edge/issues" \
HOME_URL="https://github.com/spectrocloud/ubuntu-fips-edge" \