Skip to content

Commit 53ff36e

Browse files
committed
chore(images): add delta tool
Signed-off-by: Denis Baryshev <dennybaa@gmail.com>
1 parent 8711ad2 commit 53ff36e

File tree

5 files changed

+36
-9
lines changed

5 files changed

+36
-9
lines changed

.github/workflows/publish-images.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
tags: ["24.04", "latest"]
3434
- file: alpine
3535
image: alpine
36-
tags: ["3", "3.20", "latest"]
36+
tags: ["3", "3.21", "latest"]
3737
runs-on: ubuntu-latest
3838
steps:
3939

images/alpine.containerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,10 @@ RUN apk --no-cache add \
55
bash curl wget rsync \
66
bzip2 unzip zip \
77
openssh-client parallel file netcat-openbsd \
8-
make git jq yq
8+
make git jq yq less
9+
10+
RUN \
11+
# Get delta
12+
wget -qO- https://github.com/dandavison/delta/releases/download/0.18.2/delta-0.18.2-x86_64-unknown-linux-musl.tar.gz | \
13+
tar xz -C /tmp && mv /tmp/delta-*/delta /usr/local/bin \
14+
&& rm -rf /tmp/*

images/gitops.containerfile

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,27 @@ RUN export DEBIAN_FRONTEND=noninteractive; apt-get -y update && apt-get install
55
curl wget rsync \
66
bzip2 unzip zip \
77
openssh-client parallel time file netcat-openbsd \
8-
make git jq yq gpg just \
8+
make git jq yq gpg just less \
99
# gcc is required for kcl to run \
1010
gcc \
1111
# clean up \
1212
&& apt-get -y clean \
1313
&& rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/* /var/tmp/*
1414

15+
# Fetch tools
1516
RUN \
16-
# grab latest taskfile \
17-
sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin && \
18-
# grab latest KCL \
19-
curl -sSL https://kcl-lang.io/script/install-cli.sh | /bin/bash -s
17+
# grab latest taskfile and just \
18+
sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b /usr/local/bin \
19+
&& wget -qO- "https://github.com/casey/just/releases/download/1.38.0/just-1.38.0-x86_64-unknown-linux-musl.tar.gz" | \
20+
tar xzf - -C /tmp && mv /tmp/just /usr/local/bin \
21+
# Get delta \
22+
&& cd /tmp; curl -sSLO "https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_amd64.deb" && \
23+
dpkg -i git-delta_0.18.2_amd64.deb \
24+
# grab KCL \
25+
# ref: https://github.com/kcl-lang/kcl/issues/1668 \
26+
&& curl -sSL https://kcl-lang.io/script/install-cli.sh | /bin/bash -s -- 0.9.8 \
27+
&& apt-get -y clean && rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/*
28+
2029

2130
RUN \
2231
# gcloud

images/ubuntu-22.04.containerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ RUN export DEBIAN_FRONTEND=noninteractive; apt-get -y update && apt-get install
55
curl wget rsync \
66
bzip2 unzip zip \
77
openssh-client parallel time file netcat-openbsd \
8-
make git jq \
8+
make git jq less \
99
# clean up \
1010
&& apt-get -y clean \
1111
&& rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/* /var/tmp/*
12+
13+
RUN \
14+
# Get delta \
15+
cd /tmp; curl -sSLO "https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_amd64.deb" && \
16+
dpkg -i git-delta_0.18.2_amd64.deb \
17+
&& apt-get -y clean && rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/*

images/ubuntu-24.04.containerfile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,13 @@ RUN export DEBIAN_FRONTEND=noninteractive; apt-get -y update && apt-get install
55
curl wget rsync \
66
bzip2 unzip zip \
77
openssh-client parallel time file netcat-openbsd \
8-
make git jq \
8+
make git jq less \
99
# clean up \
1010
&& apt-get -y clean \
1111
&& rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/* /var/tmp/*
12+
13+
RUN \
14+
# Get delta \
15+
cd /tmp; curl -sSLO "https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_amd64.deb" && \
16+
dpkg -i git-delta_0.18.2_amd64.deb \
17+
&& apt-get -y clean && rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/*

0 commit comments

Comments
 (0)