From 1c1413334a459b588765ac20b7270786d61bd1f5 Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Thu, 20 Jul 2023 15:09:17 +0200 Subject: [PATCH 1/2] Fix os-release flavor Signed-off-by: Mauro Morales --- Earthfile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Earthfile b/Earthfile index 2dd76d12..c32955a2 100644 --- a/Earthfile +++ b/Earthfile @@ -186,6 +186,21 @@ PROVIDER_INSTALL: COPY +build-kairos-agent-provider/agent-provider-kairos /system/providers/agent-provider-kairos RUN ln -s /system/providers/agent-provider-kairos /usr/bin/kairos + ARG KAIROS_VERSION + IF [ "$KAIROS_VERSION" = "" ] + ARG OS_VERSION=${VERSION} + ELSE + ARG OS_VERSION=${KAIROS_VERSION} + END + + ARG OS_ID + ARG OS_NAME=${OS_ID}-${FLAVOR} + ARG OS_REPO=quay.io/kairos/${VARIANT}-${FLAVOR} + ARG OS_LABEL=latest + + DO kairos+OSRELEASE --BUG_REPORT_URL="https://github.com/kairos-io/kairos/issues/new/choose" --HOME_URL="https://github.com/kairos-io/provider-kairos" --OS_ID=${OS_ID} --OS_LABEL=${OS_LABEL} --OS_NAME=${OS_NAME} --OS_REPO=${OS_REPO} --OS_VERSION=${OS_VERSION}-k3s${K3S_VERSION} --GITHUB_REPO="kairos-io/provider-kairos" --FLAVOR=${FLAVOR} + + SAVE IMAGE $IMAGE docker-rootfs: FROM +docker From 0a52531d66dd23b36f0e0548a404e926b6e87123 Mon Sep 17 00:00:00 2001 From: Mauro Morales Date: Thu, 20 Jul 2023 15:26:43 +0200 Subject: [PATCH 2/2] Fix os-release flavor Signed-off-by: Mauro Morales --- Earthfile | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/Earthfile b/Earthfile index c32955a2..488854b7 100644 --- a/Earthfile +++ b/Earthfile @@ -142,7 +142,7 @@ docker: ARG OS_REPO=quay.io/kairos/${VARIANT}-${FLAVOR} ARG OS_LABEL=latest - DO kairos+OSRELEASE --BUG_REPORT_URL="https://github.com/kairos-io/kairos/issues/new/choose" --HOME_URL="https://github.com/kairos-io/provider-kairos" --OS_ID=${OS_ID} --OS_LABEL=${OS_LABEL} --OS_NAME=${OS_NAME} --OS_REPO=${OS_REPO} --OS_VERSION=${OS_VERSION}-k3s${K3S_VERSION} --GITHUB_REPO="kairos-io/provider-kairos" --VARIANT=${VARIANT} + DO kairos+OSRELEASE --BUG_REPORT_URL="https://github.com/kairos-io/kairos/issues/new/choose" --HOME_URL="https://github.com/kairos-io/provider-kairos" --OS_ID=${OS_ID} --OS_LABEL=${OS_LABEL} --OS_NAME=${OS_NAME} --OS_REPO=${OS_REPO} --OS_VERSION=${OS_VERSION}-k3s${K3S_VERSION} --GITHUB_REPO="kairos-io/provider-kairos" --VARIANT=${VARIANT} --FLAVOR=${FLAVOR} SAVE IMAGE $IMAGE @@ -186,21 +186,6 @@ PROVIDER_INSTALL: COPY +build-kairos-agent-provider/agent-provider-kairos /system/providers/agent-provider-kairos RUN ln -s /system/providers/agent-provider-kairos /usr/bin/kairos - ARG KAIROS_VERSION - IF [ "$KAIROS_VERSION" = "" ] - ARG OS_VERSION=${VERSION} - ELSE - ARG OS_VERSION=${KAIROS_VERSION} - END - - ARG OS_ID - ARG OS_NAME=${OS_ID}-${FLAVOR} - ARG OS_REPO=quay.io/kairos/${VARIANT}-${FLAVOR} - ARG OS_LABEL=latest - - DO kairos+OSRELEASE --BUG_REPORT_URL="https://github.com/kairos-io/kairos/issues/new/choose" --HOME_URL="https://github.com/kairos-io/provider-kairos" --OS_ID=${OS_ID} --OS_LABEL=${OS_LABEL} --OS_NAME=${OS_NAME} --OS_REPO=${OS_REPO} --OS_VERSION=${OS_VERSION}-k3s${K3S_VERSION} --GITHUB_REPO="kairos-io/provider-kairos" --FLAVOR=${FLAVOR} - - SAVE IMAGE $IMAGE docker-rootfs: FROM +docker