From b41d0c1040e1cd526291044eb68ee5c13d66777b Mon Sep 17 00:00:00 2001 From: Viktor Scharf Date: Wed, 12 Aug 2026 12:09:22 +0200 Subject: [PATCH] fix(ci): stamp version into daily docker images (#3291) * fix(ci): stamp version into daily docker images * fix after review --- .woodpecker.star | 3 +++ opencloud/docker/Dockerfile.multiarch | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.woodpecker.star b/.woodpecker.star index 5a2cdfcc12..4f23824b4f 100644 --- a/.woodpecker.star +++ b/.woodpecker.star @@ -1906,6 +1906,9 @@ def dockerRelease(ctx, repo, build_type): "EDITION": "stable" if build_type == "production" else "rolling", } + if ctx.build.event != "tag": + build_args["STRING"] = ctx.build.commit[:8] + # if no additional tag is given, the build-plugin adds latest hard_tag = "daily" if ctx.build.event == "tag": diff --git a/opencloud/docker/Dockerfile.multiarch b/opencloud/docker/Dockerfile.multiarch index 47a7f9e31c..82924fbbd3 100644 --- a/opencloud/docker/Dockerfile.multiarch +++ b/opencloud/docker/Dockerfile.multiarch @@ -11,7 +11,10 @@ RUN --mount=type=bind,target=/build,rw \ --mount=type=cache,target=/go/pkg/mod \ --mount=type=cache,target=/root/.cache \ GOOS="${TARGETOS:-linux}" GOARCH="${TARGETARCH:-amd64}" ; \ - make -C ${SRCDIR:-.}/opencloud release-linux-docker-${TARGETARCH} ENABLE_VIPS=true DIST=/dist + make -C ${SRCDIR:-.}/opencloud release-linux-docker-${TARGETARCH} \ + ENABLE_VIPS=true DIST=/dist \ + VERSION="${VERSION}" EDITION="${EDITION}" \ + ${STRING:+STRING="${STRING}"} FROM alpine:3.24 ARG VERSION