From 535dfac82893a25d5dd516e08989207f9233f7db Mon Sep 17 00:00:00 2001 From: "florin-alexandru.peter@t-systems.com" Date: Wed, 25 Mar 2026 09:22:21 +0100 Subject: [PATCH] Add DPSERVICE_VERSION build arg to override version during Docker build --- Dockerfile | 3 ++- hack/get_version.sh | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e1ad6a7cc..4330095d2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ ARG DPDK_VER=25.11 ARG DPDK_BUILDTYPE=release ARG DPSERVICE_BUILDTYPE=debug ARG DPSERVICE_FEATURES="" +ARG DPSERVICE_VERSION="" WORKDIR /workspace @@ -99,7 +100,7 @@ COPY include/ include/ COPY .git/ .git/ # Compile dpservice itself -RUN meson setup build -Dbuild_dpservice_cli=true -Dbuildtype=$DPSERVICE_BUILDTYPE $DPSERVICE_FEATURES && ninja -C build +RUN DPSERVICE_VERSION="${DPSERVICE_VERSION}" meson setup build -Dbuild_dpservice_cli=true -Dbuildtype=$DPSERVICE_BUILDTYPE $DPSERVICE_FEATURES && ninja -C build # Extended build image for test-image diff --git a/hack/get_version.sh b/hack/get_version.sh index 7126dd566..019db794d 100755 --- a/hack/get_version.sh +++ b/hack/get_version.sh @@ -1,5 +1,11 @@ #!/bin/bash +# Allow overriding the version via environment variable +if [ -n "$DPSERVICE_VERSION" ]; then + echo "$DPSERVICE_VERSION" + exit 0 +fi + # For non-tagged commits, this is a simple "vX.X.X-XX-gXXXXXXX" # For dpservice-bin tagged commits, this is "vX.X.X" # For dpservice-go tagged commits, this is "go/dpservice-go/vX.X.X-XX-gXXXXXXX"