[pinot] branch master updated: Fix docker build script tagging (#10145)

[xiangfu]

This is an automated email from the ASF dual-hosted git repository.

xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git


The following commit(s) were added to refs/heads/master by this push:
     new 21c6532564 Fix docker build script tagging (#10145)
21c6532564 is described below

commit 21c6532564cb0fea682cf362a4d4eec37ef831e4
Author: Xiang Fu <xiangfu.1...@gmail.com>
AuthorDate: Wed Jan 18 17:32:00 2023 -0800

    Fix docker build script tagging (#10145)
---
 .github/workflows/scripts/docker/.pinot_docker_image_build.sh  | 10 +++++++++-
 .../scripts/docker/.pinot_docker_image_build_and_push.sh       | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/scripts/docker/.pinot_docker_image_build.sh 
b/.github/workflows/scripts/docker/.pinot_docker_image_build.sh
index 62bed0fdf5..7f9109f1d4 100755
--- a/.github/workflows/scripts/docker/.pinot_docker_image_build.sh
+++ b/.github/workflows/scripts/docker/.pinot_docker_image_build.sh
@@ -31,9 +31,17 @@ if [ -z "${BUILD_PLATFORM}" ]; then
   BUILD_PLATFORM="linux/arm64,linux/amd64"
 fi
 
+# Get pinot commit id
+ROOT_DIR=`pwd`
+rm -rf /tmp/pinot
+git clone -b ${PINOT_BRANCH} --single-branch ${PINOT_GIT_URL} /tmp/pinot
+cd /tmp/pinot
 COMMIT_ID=`git rev-parse --short HEAD`
-DATE=`date +%Y%m%d`
 VERSION=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
+rm -rf /tmp/pinot
+DATE=`date +%Y%m%d`
+cd ${ROOT_DIR}
+
 tags=()
 if [ -z "${TAGS}" ]; then
   tags=("${VERSION}-${COMMIT_ID}-${DATE}")
diff --git 
a/.github/workflows/scripts/docker/.pinot_docker_image_build_and_push.sh 
b/.github/workflows/scripts/docker/.pinot_docker_image_build_and_push.sh
index f7f46e8a60..4b6e2adea2 100755
--- a/.github/workflows/scripts/docker/.pinot_docker_image_build_and_push.sh
+++ b/.github/workflows/scripts/docker/.pinot_docker_image_build_and_push.sh
@@ -31,9 +31,17 @@ if [ -z "${BUILD_PLATFORM}" ]; then
   BUILD_PLATFORM="linux/arm64,linux/amd64"
 fi
 
+# Get pinot commit id
+ROOT_DIR=`pwd`
+rm -rf /tmp/pinot
+git clone -b ${PINOT_BRANCH} --single-branch ${PINOT_GIT_URL} /tmp/pinot
+cd /tmp/pinot
 COMMIT_ID=`git rev-parse --short HEAD`
-DATE=`date +%Y%m%d`
 VERSION=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
+rm -rf /tmp/pinot
+DATE=`date +%Y%m%d`
+cd ${ROOT_DIR}
+
 tags=()
 if [ -z "${TAGS}" ]; then
   tags=("${VERSION}-${COMMIT_ID}-${DATE}")


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org