From 6143c8199057b1479a7d03bcaaf67d20057d1091 Mon Sep 17 00:00:00 2001 From: Tyler Gillson Date: Wed, 4 Oct 2023 11:49:11 -0600 Subject: [PATCH] use custom k3s provider; add marmot & sqlite --- Dockerfile | 16 ++++------------ Earthfile | 3 ++- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 202473c..ce30479 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,8 @@ ARG BASE FROM $BASE -###########################Add any other image customizations here ####################### +# Install marmot +RUN curl -sL https://github.com/maxpert/marmot/releases/download/v0.8.6/marmot-v0.8.6-linux-amd64-static.tar.gz | tar -zxv marmot -C /usr/local/bin -#### Examples #### - -### To install the nginx package for Ubuntu ### - -#RUN apt-get update && apt-get install nginx -y - -### or - -### To install the nginx package for opensuse ### - -#RUN zypper refresh && zypper install nginx -y +# Install sqlite +RUN apt update && apt install -y sqlite3 diff --git a/Earthfile b/Earthfile index d43a122..e54bc25 100644 --- a/Earthfile +++ b/Earthfile @@ -181,7 +181,8 @@ kairos-provider-image: ELSE IF [ "$K8S_DISTRIBUTION" = "kubeadm-fips" ] ARG PROVIDER_BASE=gcr.io/spectro-images-public/kairos-io/provider-kubeadm-fips:$KUBEADM_PROVIDER_VERSION ELSE IF [ "$K8S_DISTRIBUTION" = "k3s" ] - ARG PROVIDER_BASE=gcr.io/spectro-images-public/kairos-io/provider-k3s:$K3S_PROVIDER_VERSION + # ARG PROVIDER_BASE=gcr.io/spectro-images-public/kairos-io/provider-k3s:$K3S_PROVIDER_VERSION + ARG PROVIDER_BASE=tylergillson/provider-k3s:v0.0.0-e67e81d ELSE IF [ "$K8S_DISTRIBUTION" = "rke2" ] && $FIPS_ENABLED ARG PROVIDER_BASE=gcr.io/spectro-images-public/kairos-io/provider-rke2-fips:$RKE2_PROVIDER_VERSION ELSE IF [ "$K8S_DISTRIBUTION" = "rke2" ]