From 5d5e4e139a7ef75ed3acd59012605f570b9b624e Mon Sep 17 00:00:00 2001 From: Dimitris Karakasilis Date: Tue, 24 Oct 2023 09:36:56 +0300 Subject: [PATCH] Remove TODO (already implemented) and non-used ARG "IMAGE" Signed-off-by: Dimitris Karakasilis --- .github/workflows/release.yaml | 5 +---- Earthfile | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fadf3fee5..2d022f792 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -170,8 +170,6 @@ jobs: VARIANT: ${{ matrix.variant }} MODEL: ${{ matrix.model }} BASE_IMAGE: ${{ matrix.baseImage }} - # TODO: Create a reusable script/workflow/something that generates the artifact name - # TODO: Use the naming.sh script run: | earthly +all \ --VARIANT=${{ matrix.variant }} \ @@ -179,8 +177,7 @@ jobs: --FLAVOR=${{ matrix.flavor }} \ --FLAVOR=${{ matrix.flavorRelease }} \ --MODEL=${{ matrix.model }} \ - --BASE_IMAGE=${{ matrix.baseImage }} \ - --IMAGE=quay.io/kairos/${{ matrix.variant }}-${{ inputs.flavor }}-${{ matrix.model }}:latest + --BASE_IMAGE=${{ matrix.baseImage }} sudo mv build release - name: Push to quay diff --git a/Earthfile b/Earthfile index d06ba1704..45eb4b2d3 100644 --- a/Earthfile +++ b/Earthfile @@ -699,7 +699,7 @@ iso-uki: # This target builds an iso using a remote docker image as rootfs instead of building the whole rootfs # This should be really fast as it uses an existing image. This requires a pushed image from the +image target -# defaults to use the $IMAGE name (so ttl.sh/core-opensuse-leap:latest) +# defaults to use the $REMOTE_IMG name (so ttl.sh/core-opensuse-leap:latest) # you can override either the full thing by setting --REMOTE_IMG=docker:REPO/IMAGE:TAG # or by --REMOTE_IMG=REPO/IMAGE:TAG iso-remote: