Skip to content

Commit

Permalink
update to v2.4.3 framework images
Browse files Browse the repository at this point in the history
  • Loading branch information
santhoshdaivajna committed Dec 26, 2023
1 parent dd1ffef commit 1f358ba
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 28 deletions.
9 changes: 1 addition & 8 deletions rhel-core-images/Dockerfile.rhel8
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.3.2_fedora / /
COPY --from=quay.io/kairos/framework:v2.4.3_generic / /
RUN mkdir -p /run/lock
RUN touch /usr/libexec/.keep

Expand All @@ -72,13 +72,6 @@ RUN systemctl enable sshd
RUN systemctl disable selinux-autorelabel-mark.service
#RUN systemctl enable tmp.mount


RUN systemctl enable cos-setup-reconcile.timer && \
systemctl enable cos-setup-fs.service && \
systemctl enable cos-setup-boot.service && \
systemctl enable cos-setup-network.service


COPY overlay/rhel8/ /

RUN kernel=$(ls /boot/vmlinuz-* | head -n1) && \
Expand Down
7 changes: 1 addition & 6 deletions rhel-fips/Dockerfile
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.3.2_fips-systemd / /
COPY --from=quay.io/kairos/framework:v2.4.3_fips / /

COPY overlay/rhel8 /

Expand All @@ -98,11 +98,6 @@ RUN systemctl enable sshd
RUN systemctl disable selinux-autorelabel-mark.service
#RUN systemctl enable tmp.mount

RUN systemctl enable cos-setup-reconcile.timer && \
systemctl enable cos-setup-fs.service && \
systemctl enable cos-setup-boot.service && \
systemctl enable cos-setup-network.service

# Copy the custom dracut config file
COPY dracut.conf /etc/dracut.conf.d/kairos-fips.conf

Expand Down
64 changes: 57 additions & 7 deletions slem/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,63 @@ RUN mkdir -p /run/lock
RUN mkdir -p /usr/libexec
RUN touch /usr/libexec/.keep
COPY --from=quay.io/kairos/framework:v2.4.3_opensuse-leap / /
# Activate Kairos services
RUN systemctl enable cos-setup-reconcile.timer && \
systemctl enable cos-setup-fs.service && \
systemctl enable cos-setup-boot.service && \
systemctl enable cos-setup-network.service
# Remove /etc/dracut.conf.d/90-kairos-network-legacy.conf to allow dracut to build initrd without dhcp-client
RUN rm -f /etc/dracut.conf.d/90-kairos-network-legacy.conf

RUN mkdir -p /etc/dnf
RUN echo "install_weak_deps=False" > /etc/dnf/dnf.conf

RUN zypper in --force-resolution -y \
bash-completion \
conntrack-tools \
coreutils \
curl \
device-mapper \
dhcp-client \
dosfstools \
dracut \
e2fsprogs \
fail2ban \
findutils \
gawk \
growpart \
gptfdisk \
haveged \
htop \
iproute2 \
iptables \
iputils \
issue-generator \
jq \
less \
logrotate \
lsscsi \
lvm2 \
mdadm \
multipath-tools \
nano \
# nohang \
open-iscsi \
openssh \
open-vm-tools \
parted \
pigz \
policycoreutils \
polkit \
procps \
rng-tools \
rsync \
squashfs \
strace \
sudo \
systemd \
systemd-network \
tar \
timezone \
tmux \
vim \
which \
tpm2* \
&& zypper cc \

## Generate initrd
RUN kernel=$(ls /boot/vmlinuz-* | head -n1) && \
ln -sf "${kernel#/boot/}" /boot/vmlinuz
Expand Down
8 changes: 1 addition & 7 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.3.2_fips-systemd as kairos-fips
FROM quay.io/kairos/framework:v2.4.3_fips as kairos-fips

# Base ubuntu image (focal)
FROM ubuntu:focal as base
Expand Down Expand Up @@ -122,12 +122,6 @@ COPY --from=kairos-fips / /
# Copy the os-release file to identify the OS
COPY --from=osbuilder /workspace/os-release /etc/os-release

# Activate Kairos services
RUN systemctl enable cos-setup-reconcile.timer && \
systemctl enable cos-setup-fs.service && \
systemctl enable cos-setup-boot.service && \
systemctl enable cos-setup-network.service

## Configuration
## Took from: https://github.com/kairos-io/kairos/blob/master/images/Dockerfile.ubuntu-20-lts
# workaround https://github.com/kairos-io/kairos/issues/949
Expand Down

0 comments on commit 1f358ba

Please sign in to comment.