Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(images): add delta tool #144

Merged
merged 1 commit into from
Jan 27, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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 less \
# 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 \
&& cd /tmp; curl -sSLO "https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_amd64.deb" && \
dpkg -i git-delta_0.18.2_amd64.deb \
# 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 \
cd /tmp; curl -sSLO "https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_amd64.deb" && \
dpkg -i git-delta_0.18.2_amd64.deb \
&& 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 \
cd /tmp; curl -sSLO "https://github.com/dandavison/delta/releases/download/0.18.2/git-delta_0.18.2_amd64.deb" && \
dpkg -i git-delta_0.18.2_amd64.deb \
&& apt-get -y clean && rm -rf /var/cache/apt /var/lib/apt/lists/* /tmp/*
Loading