From 74cdcc200c9a453b7279998477e4e058dc70c868 Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Thu, 7 Dec 2023 16:47:48 +0100 Subject: [PATCH] Trigger base images Signed-off-by: Mauro Morales --- Earthfile | 2 +- images/Dockerfile.alpine | 2 +- images/Dockerfile.debian | 2 +- images/Dockerfile.kairos-alpine | 2 +- images/Dockerfile.kairos-debian | 2 +- images/Dockerfile.kairos-opensuse | 2 +- images/Dockerfile.kairos-rhel | 2 +- images/Dockerfile.kairos-ubuntu | 2 +- images/Dockerfile.opensuse | 2 +- images/Dockerfile.rhel | 2 +- images/Dockerfile.ubuntu | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Earthfile b/Earthfile index 5352324eb..c8f4c7605 100644 --- a/Earthfile +++ b/Earthfile @@ -345,7 +345,7 @@ kairos-dockerfile: ARG --required FAMILY COPY ./images . RUN --no-cache cat <(echo "# This file is auto-generated with the command: earthly +kairos-dockerfile --FAMILY=${FAMILY}") \ - Dockerfile.$FAMILY \ + <(sed -n '/# WARNING:/!p' Dockerfile.$FAMILY) \ <(echo) \ <(sed -n '/# WARNING:/!p' Dockerfile.kairos) \ > ./Dockerfile diff --git a/images/Dockerfile.alpine b/images/Dockerfile.alpine index 5e13398dc..e3da9cd20 100644 --- a/images/Dockerfile.alpine +++ b/images/Dockerfile.alpine @@ -1,4 +1,4 @@ -# This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead +# WARNING: This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead ############################################################### #### ARGS #### ############################################################### diff --git a/images/Dockerfile.debian b/images/Dockerfile.debian index 765cd9a7a..37f6147e4 100644 --- a/images/Dockerfile.debian +++ b/images/Dockerfile.debian @@ -1,4 +1,4 @@ -# This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead +# WARNING: This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead ############################################################### #### ARGS #### ############################################################### diff --git a/images/Dockerfile.kairos-alpine b/images/Dockerfile.kairos-alpine index 98d0d4185..966a457d6 100644 --- a/images/Dockerfile.kairos-alpine +++ b/images/Dockerfile.kairos-alpine @@ -1,5 +1,4 @@ # This file is auto-generated with the command: earthly +kairos-dockerfile --FAMILY=alpine -# This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead ############################################################### #### ARGS #### ############################################################### @@ -151,6 +150,7 @@ RUN rc-update add sshd boot && \ rc-update add ntpd boot && \ rc-update add crond && \ rc-update add fail2ban + FROM --platform="linux/${TARGETARCH}" quay.io/kairos/framework:${FRAMEWORK_VERSION}_${SECURITY_PROFILE} AS framework FROM all AS base-kairos diff --git a/images/Dockerfile.kairos-debian b/images/Dockerfile.kairos-debian index ae10cc9ab..9cfb5f0db 100644 --- a/images/Dockerfile.kairos-debian +++ b/images/Dockerfile.kairos-debian @@ -1,5 +1,4 @@ # This file is auto-generated with the command: earthly +kairos-dockerfile --FAMILY=debian -# This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead ############################################################### #### ARGS #### ############################################################### @@ -156,6 +155,7 @@ RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo # Clear cache RUN rm -rf /var/cache/* && journalctl --vacuum-size=1K && rm /etc/machine-id && rm /var/lib/dbus/machine-id && rm /etc/hostname + FROM --platform="linux/${TARGETARCH}" quay.io/kairos/framework:${FRAMEWORK_VERSION}_${SECURITY_PROFILE} AS framework FROM all AS base-kairos diff --git a/images/Dockerfile.kairos-opensuse b/images/Dockerfile.kairos-opensuse index d3c9fd3ca..80e9c771b 100644 --- a/images/Dockerfile.kairos-opensuse +++ b/images/Dockerfile.kairos-opensuse @@ -1,5 +1,4 @@ # This file is auto-generated with the command: earthly +kairos-dockerfile --FAMILY=opensuse -# This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead ############################################################### #### ARGS #### ############################################################### @@ -160,6 +159,7 @@ FROM ${MODEL} AS all RUN zypper in --force-resolution -y \ kernel-default \ && zypper cc + FROM --platform="linux/${TARGETARCH}" quay.io/kairos/framework:${FRAMEWORK_VERSION}_${SECURITY_PROFILE} AS framework FROM all AS base-kairos diff --git a/images/Dockerfile.kairos-rhel b/images/Dockerfile.kairos-rhel index 0e4a586f5..1627cc240 100644 --- a/images/Dockerfile.kairos-rhel +++ b/images/Dockerfile.kairos-rhel @@ -1,5 +1,4 @@ # This file is auto-generated with the command: earthly +kairos-dockerfile --FAMILY=rhel -# This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead ARG FAMILY=rhel ARG FLAVOR ARG FLAVOR_RELEASE @@ -84,6 +83,7 @@ RUN systemctl enable systemd-networkd RUN systemctl enable systemd-resolved RUN systemctl disable dnf-makecache.service RUN systemctl enable sshd + FROM --platform="linux/${TARGETARCH}" quay.io/kairos/framework:${FRAMEWORK_VERSION}_${SECURITY_PROFILE} AS framework FROM all AS base-kairos diff --git a/images/Dockerfile.kairos-ubuntu b/images/Dockerfile.kairos-ubuntu index 9ca0d64ca..a28182e53 100644 --- a/images/Dockerfile.kairos-ubuntu +++ b/images/Dockerfile.kairos-ubuntu @@ -1,5 +1,4 @@ # This file is auto-generated with the command: earthly +kairos-dockerfile --FAMILY=ubuntu -# This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead ############################################################### #### ARGS #### ############################################################### @@ -254,6 +253,7 @@ RUN systemctl enable ssh RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo RUN journalctl --vacuum-size=1K && rm /etc/machine-id && rm /var/lib/dbus/machine-id && rm /etc/hostname + FROM --platform="linux/${TARGETARCH}" quay.io/kairos/framework:${FRAMEWORK_VERSION}_${SECURITY_PROFILE} AS framework FROM all AS base-kairos diff --git a/images/Dockerfile.opensuse b/images/Dockerfile.opensuse index 6e72ddb58..cf64242fb 100644 --- a/images/Dockerfile.opensuse +++ b/images/Dockerfile.opensuse @@ -1,4 +1,4 @@ -# This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead +# WARNING: This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead ############################################################### #### ARGS #### ############################################################### diff --git a/images/Dockerfile.rhel b/images/Dockerfile.rhel index b2e21c881..fd09a1249 100644 --- a/images/Dockerfile.rhel +++ b/images/Dockerfile.rhel @@ -1,4 +1,4 @@ -# This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead +# WARNING: This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead ARG FAMILY=rhel ARG FLAVOR ARG FLAVOR_RELEASE diff --git a/images/Dockerfile.ubuntu b/images/Dockerfile.ubuntu index 51822a008..0b7490c60 100644 --- a/images/Dockerfile.ubuntu +++ b/images/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -# This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead +# WARNING: This is a base image used internally for Kairos, it is not meant to be built directly, use the images/Dockerfile.kairos-* files instead ############################################################### #### ARGS #### ###############################################################