Skip to content

Commit

Permalink
use custom k3s provider; add marmot & sqlite
Browse files Browse the repository at this point in the history
  • Loading branch information
TylerGillson committed Oct 4, 2023
1 parent 82ec3f5 commit 6143c81
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 13 deletions.
16 changes: 4 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion Earthfile
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down

0 comments on commit 6143c81

Please sign in to comment.