You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/06/15 02:30:46 UTC
[dolphinscheduler] 07/12: [Fix][Docker] Fix docker image build
error (#5613)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch json_split_two
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 47812d2691b3003788bb72b670b3f8ee2b7ec6ef
Author: Shiwen Cheng <ch...@gmail.com>
AuthorDate: Thu Jun 10 14:00:28 2021 +0800
[Fix][Docker] Fix docker image build error (#5613)
---
docker/build/hooks/build | 2 +-
docker/build/hooks/build.bat | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/build/hooks/build b/docker/build/hooks/build
index 78f8317..0590761 100755
--- a/docker/build/hooks/build
+++ b/docker/build/hooks/build
@@ -24,7 +24,7 @@ printenv
if [ -z "${VERSION}" ]
then
echo "set default environment variable [VERSION]"
- export VERSION=$(cat $(pwd)/pom.xml | grep '<revision>' -m 1 | awk '{print $1}' | sed 's/<revision>//' | sed 's/<\/revision>//')
+ export VERSION=$(cat $(pwd)/pom.xml | grep '<version>' -m 1 | awk '{print $1}' | sed 's/<version>//' | sed 's/<\/version>//')
fi
if [ "${DOCKER_REPO}x" = "x" ]
diff --git a/docker/build/hooks/build.bat b/docker/build/hooks/build.bat
index bbd4b23..d4d538b 100644
--- a/docker/build/hooks/build.bat
+++ b/docker/build/hooks/build.bat
@@ -22,7 +22,7 @@ setlocal enableextensions enabledelayedexpansion
if not defined VERSION (
echo "set environment variable [VERSION]"
set first=1
- for /f "tokens=3 delims=<>" %%a in ('findstr "<revision>[0-9].*</revision>" %cd%\pom.xml') do (
+ for /f "tokens=3 delims=<>" %%a in ('findstr "<version>[0-9].*</version>" %cd%\pom.xml') do (
if !first! EQU 1 (set VERSION=%%a)
set first=0
)