diff --git a/Dockerfile b/Dockerfile index 05eb4ccb..f00ef060 100644 --- a/Dockerfile +++ b/Dockerfile @@ -120,7 +120,7 @@ RUN --mount=type=cache,id=ragflow_npm,target=/root/.npm,sharing=locked \ COPY .git /ragflow/.git -RUN version_info=$(git describe --tags --match=v* --always); \ +RUN version_info=$(git describe --tags --match=v* --first-parent --always); \ if [ "$LIGHTEN" == "1" ]; then \ version_info="$version_info slim"; \ else \ diff --git a/api/versions.py b/api/versions.py index a1f170d4..6ba1e343 100644 --- a/api/versions.py +++ b/api/versions.py @@ -43,7 +43,7 @@ def get_closest_tag_and_count(): try: # Get the current commit hash version_info = ( - subprocess.check_output(["git", "describe", "--tags", "--match=v*", "--always"]) + subprocess.check_output(["git", "describe", "--tags", "--match=v*", "--first-parent", "--always"]) .strip() .decode("utf-8") ) diff --git a/docker/update_version.sh b/docker/update_version.sh deleted file mode 100644 index f2e454d5..00000000 --- a/docker/update_version.sh +++ /dev/null @@ -1,16 +0,0 @@ -# update RAGFlow version -# Get the latest tag -last_tag=$(git describe --tags --abbrev=0) -# Get the number of commits from the last tag -commit_count=$(git rev-list --count "$last_tag..HEAD") -# Get the short commit id -last_commit=$(git rev-parse --short HEAD) - -version_info="" -if [ "$commit_count" -eq 0 ]; then - version_info=$last_tag -else - printf -v version_info "%s(%s~%d)" "$last_commit" "$last_tag" $commit_count -fi -# Replace the version in the versions.py file -sed -i "s/\"dev\"/\"$version_info\"/" api/versions.py