From 65f29facfe6dd6d02789785250f9f15199387846 Mon Sep 17 00:00:00 2001
From: Nianyu Shen <xiaoyu9964@gmail.com>
Date: Thu, 5 Sep 2024 22:35:55 -0700
Subject: [PATCH] use ubuntu image instead of ubuntu-systemd

Signed-off-by: Nianyu Shen <xiaoyu9964@gmail.com>
---
 Earthfile  | 14 +++++++-------
 earthly.sh |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Earthfile b/Earthfile
index ba3dd78..fed7d50 100644
--- a/Earthfile
+++ b/Earthfile
@@ -189,7 +189,7 @@ uki-iso:
     SAVE ARTIFACT /build/* AS LOCAL ./build/
 
 uki-provider-image:
-    FROM --platform=linux/${ARCH} +ubuntu-systemd
+    FROM --platform=linux/${ARCH} +ubuntu
     RUN apt-get update && apt-get install -y rsync
 
     WORKDIR /
@@ -414,7 +414,7 @@ download-sbctl:
     SAVE ARTIFACT /usr/bin/sbctl
 
 uki-byok:
-    FROM +ubuntu-systemd
+    FROM +ubuntu
 
     RUN apt-get update && apt-get install -y efitools curl
     COPY +download-sbctl/sbctl /usr/bin/sbctl
@@ -826,7 +826,7 @@ build-efi-size-check:
     SAVE ARTIFACT target/x86_64-unknown-uefi/debug/efi-size-check.efi
 
 iso-efi-size-check:
-    FROM +ubuntu-systemd
+    FROM +ubuntu
 
     RUN apt-get update
     RUN apt-get install -y mtools xorriso
@@ -848,13 +848,13 @@ iso-efi-size-check:
 
     SAVE ARTIFACT efi-size-check.iso AS LOCAL ./build/
 
-ubuntu-systemd:
+ubuntu:
     IF [ "$FIPS_ENABLED" = "true" ]
-        ARG SYSTEMD_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu-systemd-fips:20.04
+        ARG UBUNTU_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu-fips:22.04
     ELSE
-        ARG SYSTEMD_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu-systemd:22.04
+        ARG UBUNTU_IMAGE=$SPECTRO_PUB_REPO/third-party/ubuntu:22.04
     END
-    FROM $SYSTEMD_IMAGE
+    FROM $UBUNTU_IMAGE
 
 OS_RELEASE:
     COMMAND
diff --git a/earthly.sh b/earthly.sh
index ea0c323..a9ff8a2 100755
--- a/earthly.sh
+++ b/earthly.sh
@@ -61,7 +61,7 @@ PE_VERSION=$(git describe --abbrev=0 --tags)
 SPECTRO_PUB_REPO=gcr.io/spectro-images-public
 EARTHLY_VERSION=v0.8.5
 source .arg
-ALPINE_IMG=$SPECTRO_PUB_REPO/alpine:3.20.2
+ALPINE_IMG=$SPECTRO_PUB_REPO/canvos/alpine:3.20
 ### Verify Depencies
 # Check if Docker is installed
 if command -v docker >/dev/null 2>&1; then