Skip to content

Commit

Permalink
⬆️ Bump images, fix Earthly targets, add rockylinux
Browse files Browse the repository at this point in the history
  • Loading branch information
mudler committed Jul 22, 2022
1 parent f2558a8 commit 9a58230
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 8 deletions.
10 changes: 6 additions & 4 deletions Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ FROM alpine
ARG FLAVOR=opensuse
ARG IMAGE=quay.io/c3os/c3os:${FLAVOR}-latest
ARG LUET_VERSION=0.32.4
ARG REPOSITORIES_FILE=repositories.yaml
ARG OS_ID=c3os

IF [ "$FLAVOR" = "fedora" ] || [ "$FLAVOR" = "tumbleweed" ] || [ "$FLAVOR" = "ubuntu" ]
IF [ "$FLAVOR" = "fedora" ] || [ "$FLAVOR" = "tumbleweed" ] || [ "$FLAVOR" = "ubuntu" ] || [ "$FLAVOR" = "rockylinux" ]
ARG REPOSITORIES_FILE=repositories.yaml.${FLAVOR}
ELSE
ARG REPOSITORIES_FILE=repositories.yaml
END

ARG COSIGN_SKIP=".*quay.io/c3os/.*"
Expand Down Expand Up @@ -122,7 +124,7 @@ framework:

ENV USER=root

IF [ "$WITH_KERNEL" = "true" ] || [ "$FLAVOR" = "alpine" ] || [ "$FLAVOR" = "fedora" ] || [ "$FLAVOR" = "ubuntu" ] || [ "$FLAVOR" = "alpine-arm-rpi" ]
IF [ "$WITH_KERNEL" = "true" ] || [ "$FLAVOR" = "alpine" ] || [ "$FLAVOR" = "fedora" ] || [ "$FLAVOR" = "rockylinux" ] || [ "$FLAVOR" = "ubuntu" ] || [ "$FLAVOR" = "alpine-arm-rpi" ]
RUN /usr/bin/luet install -y --system-target /framework \
meta/cos-verify \
meta/cos-core \
Expand Down Expand Up @@ -184,7 +186,7 @@ docker:
ELSE
ARG OS_VERSION=${K3S_VERSION}+k3s1-c3OS${C3OS_VERSION}
END
ARG OS_ID=c3os
ARG OS_ID
ARG FLAVOR
ARG OS_NAME=${OS_ID}-${FLAVOR}
ARG OS_REPO=quay.io/c3os/c3os
Expand Down
4 changes: 2 additions & 2 deletions images/Dockerfile.fedora
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=fedora:33
ARG BASE_IMAGE=fedora:37

FROM $BASE_IMAGE
ARG K3S_VERSION
Expand All @@ -8,6 +8,7 @@ RUN dnf install -y \
NetworkManager \
squashfs-tools \
dracut-live \
dracut-squash \
efibootmgr \
audit \
sudo \
Expand All @@ -22,7 +23,6 @@ RUN dnf install -y \
which \
curl \
nano \
nohang-desktop \
gawk \
haveged \
tar \
Expand Down
39 changes: 39 additions & 0 deletions images/Dockerfile.rockylinux
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
ARG BASE_IMAGE=rockylinux:9

FROM $BASE_IMAGE
ARG K3S_VERSION

RUN echo "install_weak_deps=False" >> /etc/dnf/dnf.conf
RUN dnf install -y \
NetworkManager \
squashfs-tools \
dracut-live \
dracut-squash \
efibootmgr \
audit \
sudo \
systemd \
parted \
dracut \
e2fsprogs \
dosfstools \
device-mapper \
grub2 \
which \
curl \
nano \
gawk \
tar \
openssh-server \
shim-x64 \
grub2-pc \
grub2-efi-x64 \
grub2-efi-x64-modules \
rsync && dnf clean all

ENV INSTALL_K3S_VERSION=${K3S_VERSION}
ENV INSTALL_K3S_BIN_DIR="/usr/bin"
RUN curl -sfL https://get.k3s.io > installer.sh
RUN INSTALL_K3S_SKIP_START="true" INSTALL_K3S_SKIP_ENABLE="true" sh installer.sh
RUN INSTALL_K3S_SKIP_START="true" INSTALL_K3S_SKIP_ENABLE="true" sh installer.sh agent
RUN rm -rf installer.sh
4 changes: 2 additions & 2 deletions images/Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=ubuntu:20.04
ARG BASE_IMAGE=ubuntu:22.10

FROM $BASE_IMAGE
ARG K3S_VERSION
Expand All @@ -21,7 +21,7 @@ RUN apt install -y \
iproute2 \
squashfs-tools \
parted dracut \
dracut-network tar \
dracut-network dracut-live tar \
e2fsprogs \
dosfstools \
coreutils \
Expand Down

0 comments on commit 9a58230

Please sign in to comment.