Skip to content

Commit e897bbb

Browse files
committed
ci: install caddy via static binary
1 parent 6c7b33e commit e897bbb

2 files changed

Lines changed: 15 additions & 6 deletions

File tree

.github/Dockerfile

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive && \
2525
libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 \
2626
libxss1 libxtst6 lsb-release wget xdg-utils \
2727
# Additional tools
28-
gh libgmp3-dev software-properties-common curl git unzip bc \
28+
gh libgmp3-dev curl git unzip bc \
2929
debian-keyring debian-archive-keyring apt-transport-https \
3030
# LLVM dependencies
3131
llvm-19 llvm-19-dev llvm-19-runtime clang-19 clang-tools-19 \
@@ -117,9 +117,18 @@ ENV PATH="$ASDF_DATA_DIR/shims:$PATH"
117117
RUN asdf plugin add scarb && asdf install scarb 2.8.2 && asdf set scarb 2.8.2
118118

119119
# Install caddy
120-
RUN curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/gpg.key' | gpg --dearmor -o /usr/share/keyrings/caddy-stable-archive-keyring.gpg && \
121-
curl -1sLf 'https://dl.cloudsmith.io/public/caddy/stable/debian.deb.txt' | tee /etc/apt/sources.list.d/caddy-stable.list && \
122-
apt update && apt install caddy && rm -rf /var/lib/apt/lists/*
120+
ARG TARGETPLATFORM
121+
RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
122+
curl -L https://github.com/caddyserver/caddy/releases/download/v2.10.0/caddy_2.10.0_linux_arm64.tar.gz -o caddy.tar.gz && \
123+
tar -xzf caddy.tar.gz caddy && \
124+
mv caddy /usr/local/bin/ && \
125+
rm caddy.tar.gz; \
126+
elif [ "$TARGETPLATFORM" = "linux/amd64" ] ; then \
127+
curl -L https://github.com/caddyserver/caddy/releases/download/v2.10.0/caddy_2.10.0_linux_amd64.tar.gz -o caddy.tar.gz && \
128+
tar -xzf caddy.tar.gz caddy && \
129+
mv caddy /usr/local/bin/ && \
130+
rm caddy.tar.gz; \
131+
fi
123132

124133
# Set permissions
125134
RUN chown -R root:root /usr/local/cargo && chmod -R 700 /usr/local/cargo

.github/workflows/dockerfile-build-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66
- ".github/Dockerfile"
77

88
env:
9-
RUST_VERSION: 1.86.0
10-
CLIPPY_VERSION: nightly-2025-02-20
9+
RUST_VERSION: 1.89.0
10+
CLIPPY_VERSION: nightly-2025-06-20
1111

1212
jobs:
1313
build-dev-image:

0 commit comments

Comments
 (0)