Skip to content

Commit

Permalink
chore(images): add delta tool
Browse files Browse the repository at this point in the history
Signed-off-by: Denis Baryshev <dennybaa@gmail.com>
  • Loading branch information
dennybaa committed Jan 27, 2025
1 parent 8711ad2 commit bbd18a2
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/publish-images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
tags: ["24.04", "latest"]
- file: alpine
image: alpine
tags: ["3", "3.20", "latest"]
tags: ["3", "3.21", "latest"]
runs-on: ubuntu-latest
steps:

Expand Down
8 changes: 7 additions & 1 deletion images/alpine.containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
wget -qO- https://github.com/dandavison/delta/releases/download/0.18.2/delta-0.18.2-x86_64-unknown-linux-musl.tar.gz | \
tar xz -C /tmp && mv /tmp/delta-*/delta /usr/local/bin \
&& rm -rf /tmp/*
19 changes: 14 additions & 5 deletions images/gitops.containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 7 additions & 1 deletion images/ubuntu-22.04.containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/*
8 changes: 7 additions & 1 deletion images/ubuntu-24.04.containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/*

0 comments on commit bbd18a2

Please sign in to comment.