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

updated kairos to 2.4.5 and base images list #151

Merged
merged 1 commit into from
Apr 1, 2024
Merged

updated kairos to 2.4.5 and base images list #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -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
Expand All @@ -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 ]
Expand Down
15 changes: 8 additions & 7 deletions image.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
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
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 @@ -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

Expand Down
2 changes: 1 addition & 1 deletion rhel-fips/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
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.4.3_fips / /
COPY --from=quay.io/kairos/framework:v2.4.5-fips / /

COPY overlay/rhel8 /

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.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
Expand Down
2 changes: 1 addition & 1 deletion ubuntu-fips/Dockerfile
View file
Open in desktop
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.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
Expand Down