chore(build): support tag in longhorn/dep-versions

Longhorn 10208 Signed-off-by: Derek Su <[email protected]> (cherry picked from commit 261ae97)
longhorn · Feb 18, 2025 · f5d290d · f5d290d
1 parent 32a5ea2
commit f5d290d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/package/Dockerfile b/package/Dockerfile
@@ -2,7 +2,8 @@
 
 FROM registry.suse.com/bci/bci-base:15.6 AS build
 
-ARG BRANCH=main
+ARG SRC_BRANCH=main
+ARG SRC_TAG
 
 RUN zypper -n ref && \
     zypper update -y
@@ -19,7 +20,12 @@ RUN zypper -n install autoconf bison curl cmake doxygen make git gcc14 gcc14-c++
     tar gzip dbus-1-devel lsb-release graphviz-devel libnsl-devel libcurl-devel libjson-c-devel libacl-devel jq && \
     rm -rf /var/cache/zypp/*
 
-RUN git clone https://github.com/longhorn/dep-versions.git -b ${BRANCH} /usr/src/dep-versions
+RUN git clone https://github.com/longhorn/dep-versions.git -b ${SRC_BRANCH} /usr/src/dep-versions && \
+    cd /usr/src/dep-versions && \
+    if [ -n "${SRC_TAG}" ] && git show-ref --tags ${SRC_TAG} > /dev/null 2>&1; then \
+        echo "Checking out tag ${SRC_TAG}"; \
+        cd /usr/src/dep-versions && git checkout tags/${SRC_TAG}; \
+    fi
 
 # Build nfs-ganesha
 RUN export REPO_OVERRIDE="" && \

diff --git a/scripts/package b/scripts/package
@@ -53,7 +53,8 @@ function get_branch() {
   fi
 }
 
-BRANCH=$(get_branch)
+SRC_BRANCH=$(get_branch)
+SRC_TAG=$(git tag --points-at HEAD | head -n 1)
 
 # update base image to get latest changes
 BASE_IMAGE=`grep FROM package/Dockerfile | grep -v AS | awk '{print $2}'`
@@ -63,7 +64,8 @@ echo "Building image ${IMAGE} based on ${BASE_IMAGE}"
 buildx build \
   --load \
   --build-arg ARCH="${ARCH}" \
-  --build-arg BRANCH="${BRANCH}" \
+  --build-arg SRC_BRANCH="${SRC_BRANCH}" \
+  --build-arg SRC_TAG="${SRC_TAG}" \
   -t "${IMAGE}" \
   -f package/Dockerfile .