Skip to content

Commit 7322a34

Browse files
abhinavnagarajabhinavnagaraj
authored
Open PE-7402 PE-7478: update to kairos 3.5.3 and kairos-init 0.5.20 (#455)
1 parent 760a1f8 commit 7322a34

File tree

9 files changed

+20
-21
lines changed

9 files changed

+20
-21
lines changed

‎Earthfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ARG KAIROS_BASE_IMAGE_URL=$SPECTRO_PUB_REPO/edge
2020

2121
# Spectro Cloud and Kairos tags.
2222
ARG PE_VERSION=v4.7.11
23-
ARG KAIROS_VERSION=v3.5.2
23+
ARG KAIROS_VERSION=v3.5.3
2424
ARG K3S_FLAVOR_TAG=k3s1
2525
ARG RKE2_FLAVOR_TAG=rke2r1
2626
ARG BASE_IMAGE_URL=quay.io/kairos

‎rhel-core-images/Dockerfile.rhel8‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM quay.io/kairos/kairos-init:v0.5.18 AS kairos-init
1+
FROM quay.io/kairos/kairos-init:v0.5.20 AS kairos-init
22
FROM registry.access.redhat.com/ubi8/ubi-init:8.7-10
33

44
ARG USERNAME
55
ARG PASSWORD
6-
ARG KAIROS_VERSION=v3.5.2
6+
ARG KAIROS_VERSION=v3.5.3
77

88
RUN dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y
99
# Subscription manager in redhat does not run directly in containers unless you run on a redhat host, hence we remove the rhsm-host, login to the redhat subscription and add the repos
@@ -93,4 +93,4 @@ RUN rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id
9393

9494
RUN subscription-manager unregister
9595

96-
RUN if [ ! -f /boot/efi/EFI/redhat/shim.efi ]; then cp /boot/efi/EFI/redhat/shimx64.efi /boot/efi/EFI/redhat/shim.efi; fi
96+
RUN if [ ! -f /boot/efi/EFI/redhat/shim.efi ]; then cp /boot/efi/EFI/redhat/shimx64.efi /boot/efi/EFI/redhat/shim.efi; fi

‎rhel-core-images/Dockerfile.rhel8.sat‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi-init:8.7-10
2-
ARG KAIROS_INIT_IMAGE=quay.io/kairos/kairos-init:v0.5.18
2+
ARG KAIROS_INIT_IMAGE=quay.io/kairos/kairos-init:v0.5.20
33

44
FROM $KAIROS_INIT_IMAGE as kairos-init
55

@@ -8,7 +8,7 @@ FROM $BASE_IMAGE
88
ARG ORGNAME
99
ARG KEYNAME
1010
ARG SATHOSTNAME
11-
ARG KAIROS_VERSION=v3.5.2
11+
ARG KAIROS_VERSION=v3.5.3
1212

1313
RUN dnf config-manager --disable ubi-8-appstream-rpms ubi-8-baseos-rpms ubi-8-codeready-builder-rpms
1414
RUN rm /etc/rhsm-host
@@ -95,4 +95,4 @@ RUN rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id
9595

9696
RUN subscription-manager unregister
9797

98-
RUN if [ ! -f /boot/efi/EFI/redhat/shim.efi ]; then cp /boot/efi/EFI/redhat/shimx64.efi /boot/efi/EFI/redhat/shim.efi; fi
98+
RUN if [ ! -f /boot/efi/EFI/redhat/shim.efi ]; then cp /boot/efi/EFI/redhat/shimx64.efi /boot/efi/EFI/redhat/shim.efi; fi

‎rhel-core-images/Dockerfile.rhel9‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM quay.io/kairos/kairos-init:v0.5.18 AS kairos-init
1+
FROM quay.io/kairos/kairos-init:v0.5.20 AS kairos-init
22
FROM registry.access.redhat.com/ubi9-init:9.4-6
33

44
ARG USERNAME
55
ARG PASSWORD
6-
ARG KAIROS_VERSION=v3.5.2
6+
ARG KAIROS_VERSION=v3.5.3
77

88
RUN dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm -y
99
# Subscription manager in redhat does not run directly in containers unless you run on a redhat host, hence we remove the rhsm-host, login to the redhat subscription and add the repos

‎rhel-core-images/Dockerfile.rhel9.sat‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ARG BASE_IMAGE=registry.access.redhat.com/ubi9-init:9.4-6
2-
ARG KAIROS_INIT_IMAGE=quay.io/kairos/kairos-init:v0.5.18
2+
ARG KAIROS_INIT_IMAGE=quay.io/kairos/kairos-init:v0.5.20
33

44
FROM $KAIROS_INIT_IMAGE as kairos-init
55

@@ -8,7 +8,7 @@ FROM $BASE_IMAGE
88
ARG ORGNAME
99
ARG KEYNAME
1010
ARG SATHOSTNAME
11-
ARG KAIROS_VERSION=v3.5.2
11+
ARG KAIROS_VERSION=v3.5.3
1212

1313
RUN dnf config-manager --disable ubi-9-appstream-rpms ubi-9-baseos-rpms ubi-9-codeready-builder-rpms
1414
RUN rm /etc/rhsm-host

‎rhel-fips/Dockerfile.rhel8‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Kairos init image
2-
FROM quay.io/kairos/kairos-init:v0.5.18 AS kairos-init
2+
FROM quay.io/kairos/kairos-init:v0.5.20 AS kairos-init
33

44
FROM registry.access.redhat.com/ubi8/ubi-init:8.7-10 as base
55

66
ARG USERNAME
77
ARG PASSWORD
88

99
# Generate os-release file
10-
ARG KAIROS_VERSION=v3.5.2
10+
ARG KAIROS_VERSION=v3.5.3
1111

1212
# Don't get asked while running apt commands
1313
ENV DEBIAN_FRONTEND=noninteractive
@@ -114,4 +114,4 @@ RUN rm -rf /boot/initramfs-*
114114

115115
COPY overlay/rhel8/ /
116116

117-
RUN if [ ! -f /boot/efi/EFI/redhat/shim.efi ]; then cp /boot/efi/EFI/redhat/shimx64.efi /boot/efi/EFI/redhat/shim.efi; fi
117+
RUN if [ ! -f /boot/efi/EFI/redhat/shim.efi ]; then cp /boot/efi/EFI/redhat/shimx64.efi /boot/efi/EFI/redhat/shim.efi; fi

‎rhel-fips/Dockerfile.rhel9‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Kairos init image
2-
FROM quay.io/kairos/kairos-init:v0.5.18 AS kairos-init
2+
FROM quay.io/kairos/kairos-init:v0.5.20 AS kairos-init
33

44
FROM registry.access.redhat.com/ubi9-init:9.4-6 as base
55

66
ARG USERNAME
77
ARG PASSWORD
88

99
# Generate os-release file
10-
ARG KAIROS_VERSION=v3.5.2
10+
ARG KAIROS_VERSION=v3.5.3
1111

1212
# Don't get asked while running apt commands
1313
ENV DEBIAN_FRONTEND=noninteractive

‎slem/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM quay.io/kairos/kairos-init:v0.5.18 AS kairos-init
1+
FROM quay.io/kairos/kairos-init:v0.5.20 AS kairos-init
22

33
FROM registry.suse.com/suse/sle-micro-rancher/5.4:latest
44

@@ -9,8 +9,7 @@ RUN zypper --gpg-auto-import-keys ref
99
ADD repos/opensuse* /etc/zypp/repos.d/
1010
RUN zypper --gpg-auto-import-keys ref
1111

12-
ARG KAIROS_VERSION=v3.5.2
13-
12+
ARG KAIROS_VERSION=v3.5.3
1413
COPY --from=kairos-init /kairos-init /kairos-init
1514

1615
RUN zypper -n in \

‎ubuntu-fips/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11

22
# Kairos init image
3-
FROM quay.io/kairos/kairos-init:v0.5.18 AS kairos-init
3+
FROM quay.io/kairos/kairos-init:v0.5.20 AS kairos-init
44

55
# Base ubuntu image (focal)
66
FROM ubuntu:focal as base
77

8-
ARG KAIROS_VERSION=v3.5.2
8+
ARG KAIROS_VERSION=v3.5.3
99

1010
# Don't get asked while running apt commands
1111
ENV DEBIAN_FRONTEND=noninteractive

0 commit comments

Comments
 (0)