diff --git a/images/alpine.containerfile b/images/alpine.containerfile index 0cbda0a..2a74542 100644 --- a/images/alpine.containerfile +++ b/images/alpine.containerfile @@ -5,4 +5,10 @@ RUN apk --no-cache add \ bash curl wget rsync \ bzip2 unzip zip \ openssh-client parallel file netcat-openbsd \ - make git jq yq + make git jq yq less + +RUN \ + # Get delta + pkgurl="https://github.com/dandavison/delta/releases/download/0.18.2/delta-0.18.2-x86_64-unknown-linux-musl.tar.gz" + wget -qO /tmp/delta.tgz "$pkgurl" && tar xzf /tmp/delta.tgz -C /tmp && mv /tmp/delta-*/delta /usr/local/bin + rm -rf /tmp/delta.tgz /tmp/delta-* diff --git a/images/gitops.containerfile b/images/gitops.containerfile index e998987..7fdce6c 100644 --- a/images/gitops.containerfile +++ b/images/gitops.containerfile @@ -5,18 +5,27 @@ RUN export DEBIAN_FRONTEND=noninteractive; apt-get -y update && apt-get install curl wget rsync \ bzip2 unzip zip \ openssh-client parallel time file netcat-openbsd \ - make git jq yq gpg just \ + make git jq yq gpg just lest \ # gcc is required for kcl to run \ gcc \ # clean up \ && apt-get -y clean \ && rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/* /var/tmp/* +# Fetch tools RUN \ - # grab latest taskfile \ - sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin && \ - # grab latest KCL \ - curl -sSL https://kcl-lang.io/script/install-cli.sh | /bin/bash -s + # grab latest taskfile and just \ + sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin \ + && wget -qO- "https://github.com/casey/just/releases/download/1.38.0/just-1.38.0-x86_64-unknown-linux-musl.tar.gz" | \ + tar xzf - -C /tmp && mv /tmp/just /usr/local/bin \ + # Get delta \ + && wget -qO- "https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_amd64.deb" | \ + dpkg -i /dev/stdin \ + # grab KCL \ + # ref: https://github.com/kcl-lang/kcl/issues/1668 \ + && curl -sSL https://kcl-lang.io/script/install-cli.sh | /bin/bash -s -- 0.9.8 \ + && apt-get -y clean && rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/* + RUN \ # gcloud diff --git a/images/ubuntu-22.04.containerfile b/images/ubuntu-22.04.containerfile index 06340c8..99c03f1 100644 --- a/images/ubuntu-22.04.containerfile +++ b/images/ubuntu-22.04.containerfile @@ -5,7 +5,13 @@ RUN export DEBIAN_FRONTEND=noninteractive; apt-get -y update && apt-get install curl wget rsync \ bzip2 unzip zip \ openssh-client parallel time file netcat-openbsd \ - make git jq \ + make git jq less \ # clean up \ && apt-get -y clean \ && rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN \ + # Get delta \ + && wget -qO- "https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_amd64.deb" | \ + dpkg -i /dev/stdin \ + && apt-get -y clean && rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/* diff --git a/images/ubuntu-24.04.containerfile b/images/ubuntu-24.04.containerfile index 0a55838..47f3fb1 100644 --- a/images/ubuntu-24.04.containerfile +++ b/images/ubuntu-24.04.containerfile @@ -5,7 +5,13 @@ RUN export DEBIAN_FRONTEND=noninteractive; apt-get -y update && apt-get install curl wget rsync \ bzip2 unzip zip \ openssh-client parallel time file netcat-openbsd \ - make git jq \ + make git jq less \ # clean up \ && apt-get -y clean \ && rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/* /var/tmp/* + +RUN \ + # Get delta \ + && wget -qO- "https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_amd64.deb" | \ + dpkg -i /dev/stdin \ + && apt-get -y clean && rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/*