Skip to content

Commit 5ce8609

Browse files
authored
Merge pull request #410 from loong64/fix_pkg_engine
engine: fix versioning by propagating `TAGPREFIX`
2 parents 05db2dc + 46f1bb5 commit 5ce8609

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

pkg/docker-engine/Dockerfile

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ ARG GO_IMAGE="golang"
3434
ARG GO_VERSION="1.26.2"
3535
ARG GO_IMAGE_VARIANT="bookworm"
3636

37+
ARG TAGPREFIX="docker-"
38+
3739
# stage used as named context that mounts hack/scripts
3840
# see pkg target in docker-bake.hcl
3941
FROM scratch AS scripts
@@ -65,6 +67,7 @@ FROM src-base AS metadata-builder
6567
ARG PKG_REPO
6668
ARG PKG_REF
6769
ARG NIGHTLY_BUILD
70+
ARG TAGPREFIX
6871
RUN --mount=type=bind,from=scripts,source=gen-ver.sh,target=/usr/local/bin/gen-ver \
6972
--mount=type=bind,from=src,source=/src,target=/src <<EOT
7073
set -e
@@ -120,6 +123,7 @@ ARG PKG_DEB_BUILDFLAGS
120123
ARG PKG_DEB_REVISION
121124
ARG PKG_DEB_EPOCH
122125
ARG SOURCE_DATE_EPOCH
126+
ARG TAGPREFIX
123127
RUN --mount=type=bind,source=scripts/pkg-deb-build.sh,target=/usr/local/bin/pkg-deb-build \
124128
--mount=type=bind,source=scripts/check-gomod.sh,target=/usr/local/bin/check-gomod \
125129
--mount=type=bind,from=scripts,source=gen-ver.sh,target=/usr/local/bin/gen-ver \
@@ -166,6 +170,7 @@ ARG PKG_PACKAGER
166170
ARG PKG_RPM_BUILDFLAGS
167171
ARG PKG_RPM_RELEASE
168172
ARG SOURCE_DATE_EPOCH
173+
ARG TAGPREFIX
169174
RUN --mount=type=bind,source=scripts/pkg-rpm-build.sh,target=/usr/local/bin/pkg-rpm-build \
170175
--mount=type=bind,source=scripts/check-gomod.sh,target=/usr/local/bin/check-gomod \
171176
--mount=type=bind,from=scripts,source=gen-ver.sh,target=/usr/local/bin/gen-ver \
@@ -195,6 +200,7 @@ RUN apt-get install -y --no-install-recommends clang cmake gcc libc6-dev lld llv
195200
ARG PKG_NAME
196201
ARG PKG_REF
197202
ARG NIGHTLY_BUILD
203+
ARG TAGPREFIX
198204
WORKDIR /build
199205
ARG TARGETPLATFORM
200206
RUN xx-apt-get install -y gcc libc6-dev libapparmor-dev libnftables-dev libsecret-1-dev libsystemd-dev libudev-dev pkg-config

0 commit comments

Comments
 (0)