diff --git a/Earthfile b/Earthfile index d59c2e71f..fedde980e 100644 --- a/Earthfile +++ b/Earthfile @@ -1019,48 +1019,3 @@ luet-versions: FROM +base-image SAVE ARTIFACT /framework/etc/kairos/versions.yaml versions.yaml AS LOCAL build/versions.yaml - -# Installs the needed bits for "standard" images (the provider ones) -PROVIDER_INSTALL: - COMMAND - - ARG PROVIDER_KAIROS_BRANCH - - COPY +luet/luet /usr/bin/luet - - IF [ "$PROVIDER_KAIROS_BRANCH" = "" ] # Install with luet (released versions of the binary) - # We don't specify a version. To bump, just change what the latest version - # in the repository is. - RUN luet install -y system/provider-kairos - RUN luet database get-all-installed --output /etc/kairos/versions.yaml - ELSE # Install from a branch - COPY github.com/kairos-io/provider-kairos:$PROVIDER_KAIROS_BRANCH+build-kairos-agent-provider/agent-provider-kairos /system/providers/agent-provider-kairos - RUN ln -s /system/providers/agent-provider-kairos /usr/bin/kairos - END - -# Installs k3s (for "standard" images) -INSTALL_K3S: - COMMAND - - ARG FLAVOR - - IF [ "$K3S_VERSION" = "" ] - RUN echo "$K3S_VERSION must be set" && exit 1 - END - - IF [ "$K3S_VERSION" = "latest" ] # Install latest using the upstream installer - ENV INSTALL_K3S_BIN_DIR="/usr/bin" - RUN curl -sfL https://get.k3s.io > installer.sh \ - && INSTALL_K3S_SELINUX_WARN=true INSTALL_K3S_SKIP_START="true" INSTALL_K3S_SKIP_ENABLE="true" INSTALL_K3S_SKIP_SELINUX_RPM="true" bash installer.sh \ - && INSTALL_K3S_SELINUX_WARN=true INSTALL_K3S_SKIP_START="true" INSTALL_K3S_SKIP_ENABLE="true" INSTALL_K3S_SKIP_SELINUX_RPM="true" bash installer.sh agent \ - && rm -rf installer.sh - ELSE - IF [[ "$FLAVOR" =~ ^alpine* ]] - ARG _LUET_K3S=$(echo k8s/k3s-openrc@${K3S_VERSION}) - ELSE - ARG _LUET_K3S=$(echo k8s/k3s-systemd@${K3S_VERSION}) - END - END - - RUN luet install -y ${_LUET_K3S} utils/edgevpn utils/k9s utils/nerdctl container/kubectl utils/kube-vip - RUN luet database get-all-installed --output /etc/kairos/versions.yaml