From 37ee7cdc688f1b136e2bdc6d3c629201d3668b68 Mon Sep 17 00:00:00 2001 From: Joe Carstairs Date: Mon, 22 Jun 2026 08:01:40 +0100 Subject: [PATCH] arg-ifies versions --- agate/Dockerfile | 10 ++++++---- agate/version | 1 + alpine-version | 1 + comitium/Dockerfile | 12 +++++++----- comitium/version | 1 + 5 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 agate/version create mode 100644 alpine-version create mode 100644 comitium/version diff --git a/agate/Dockerfile b/agate/Dockerfile index 438407d..8bb1ce3 100644 --- a/agate/Dockerfile +++ b/agate/Dockerfile @@ -1,6 +1,8 @@ -FROM docker.io/library/alpine:3.23 +ARG ALPINE_VERSION +FROM docker.io/alpine:${ALPINE_VERSION} +ARG VERSION RUN apk --no-cache add rust cargo \ - && wget -O - https://github.com/mbrubeck/agate/archive/refs/tags/v3.3.20.tar.gz | tar -xz \ - && cargo install --path agate-3.3.20/ \ + && wget -O - https://github.com/mbrubeck/agate/archive/refs/tags/v${VERSION}.tar.gz | tar -xz \ + && cargo install --path agate-${VERSION}/ \ && apk del rust cargo \ - && rm -rf agate-3.3.20 agate-target + && rm -rf agate-${VERSION} agate-target diff --git a/agate/version b/agate/version new file mode 100644 index 0000000..3df908d --- /dev/null +++ b/agate/version @@ -0,0 +1 @@ +3.3.20 diff --git a/alpine-version b/alpine-version new file mode 100644 index 0000000..0f4de9d --- /dev/null +++ b/alpine-version @@ -0,0 +1 @@ +3.23 diff --git a/comitium/Dockerfile b/comitium/Dockerfile index d0c35f4..47644c5 100644 --- a/comitium/Dockerfile +++ b/comitium/Dockerfile @@ -1,7 +1,9 @@ -FROM alpine:3.23 +ARG ALPINE_VERSION +FROM docker.io/alpine:${ALPINE_VERSION} +ARG VERSION RUN apk --no-cache add make go scdoc \ - && wget -O - https://git.sr.ht/~nytpu/comitium/archive/v1.8.2.tar.gz | tar -xz \ - && make --directory=comitium-v1.8.2 \ - && mv comitium-v1.8.2/build/comitium /usr/local/bin/comitium \ + && wget -O - https://git.sr.ht/~nytpu/comitium/archive/v${VERSION}.tar.gz | tar -xz \ + && make --directory=comitium-v${VERSION} \ + && mv comitium-v${VERSION}/build/comitium /usr/local/bin/comitium \ && apk del make go scdoc \ - && rm -rf comitium-v1.8.2 + && rm -rf comitium-v${VERSION} diff --git a/comitium/version b/comitium/version new file mode 100644 index 0000000..53adb84 --- /dev/null +++ b/comitium/version @@ -0,0 +1 @@ +1.8.2