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.

Sign up for GitHub

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

kairos v3.1.0 #231

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −8
Draft

kairos v3.1.0 #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea92eae
kairos v3.1.0
Dr-N00B Jul 17, 2024
b217d66
custom framework image
Dr-N00B Jul 22, 2024
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
4 changes: 2 additions & 2 deletions Earthfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion rhel-core-images/Dockerfile.rhel8
View file
Open in desktop
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.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
Expand Down
4 changes: 2 additions & 2 deletions rhel-fips/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion slem/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions ubuntu-fips/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down