From 1f42b183d8036c6ffa321b770dba613b5a3d4488 Mon Sep 17 00:00:00 2001 From: Nianyu Shen Date: Wed, 14 Aug 2024 12:39:05 -0700 Subject: [PATCH 1/3] +iso-disk-image: build iso and push iso as a oci image Signed-off-by: Nianyu Shen --- Earthfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Earthfile b/Earthfile index b8d28fbc..f402aca9 100644 --- a/Earthfile +++ b/Earthfile @@ -116,6 +116,7 @@ ELSE END ARG IMAGE_PATH=$IMAGE_REGISTRY/$IMAGE_REPO:$K8S_DISTRIBUTION-$K8S_VERSION-$IMAGE_TAG +ARG ISO_DISK_IMG=$IMAGE_REGISTRY/$IMAGE_REPO/$ISO_NAME:$IMAGE_TAG ARG CMDLINE="stylus.registration" build-all-images: @@ -866,10 +867,11 @@ iso-image: SAVE IMAGE palette-installer-image:$IMAGE_TAG iso-disk-image: - FROM scratch + BUILD +iso + FROM scratch COPY +iso/*.iso /disk/ - SAVE IMAGE --push $IMAGE_REGISTRY/$IMAGE_REPO/$ISO_NAME:$IMAGE_TAG + SAVE IMAGE --push $ISO_DISK_IMG go-deps: FROM $SPECTRO_PUB_REPO/golang:${GOLANG_VERSION}-alpine From 15933c96a3f3051eaa29e3d20b556471ea82a3ea Mon Sep 17 00:00:00 2001 From: Nianyu Shen Date: Wed, 14 Aug 2024 12:56:08 -0700 Subject: [PATCH 2/3] change default ISO_DISK_IMG Signed-off-by: Nianyu Shen --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index f402aca9..5a01ef90 100644 --- a/Earthfile +++ b/Earthfile @@ -116,7 +116,7 @@ ELSE END ARG IMAGE_PATH=$IMAGE_REGISTRY/$IMAGE_REPO:$K8S_DISTRIBUTION-$K8S_VERSION-$IMAGE_TAG -ARG ISO_DISK_IMG=$IMAGE_REGISTRY/$IMAGE_REPO/$ISO_NAME:$IMAGE_TAG +ARG ISO_DISK_IMG=$IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG ARG CMDLINE="stylus.registration" build-all-images: From 97685e4e535bc717163355767e0149899e38d926 Mon Sep 17 00:00:00 2001 From: Nianyu Shen Date: Wed, 14 Aug 2024 12:56:20 -0700 Subject: [PATCH 3/3] more Signed-off-by: Nianyu Shen --- Earthfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Earthfile b/Earthfile index 5a01ef90..824e8116 100644 --- a/Earthfile +++ b/Earthfile @@ -116,7 +116,7 @@ ELSE END ARG IMAGE_PATH=$IMAGE_REGISTRY/$IMAGE_REPO:$K8S_DISTRIBUTION-$K8S_VERSION-$IMAGE_TAG -ARG ISO_DISK_IMG=$IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG +ARG ISO_DISK_IMG=$IMAGE_REGISTRY/$IMAGE_REPO:$IMAGE_TAG-iso ARG CMDLINE="stylus.registration" build-all-images: