Trigger base images

Signed-off-by: Mauro Morales <[email protected]>
kairos-io · Dec 7, 2023 · 74cdcc2 · 74cdcc2
1 parent 2a6813e
commit 74cdcc2
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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                        ####
 ###############################################################