diff --git a/docker/build/hooks/build.bat b/docker/build/hooks/build.bat index fd7c9b55ba9f22f305fd09ab534a21dbb481d203..e81026476e032383f7203fd0178e08d6fd78fa5b 100644 --- a/docker/build/hooks/build.bat +++ b/docker/build/hooks/build.bat @@ -17,15 +17,20 @@ echo "------ dolphinscheduler start - build -------" set +setlocal enableextensions enabledelayedexpansion if not defined VERSION ( echo "set environment variable [VERSION]" - for /f %%l in (%cd%\sql\soft_version) do (set VERSION=%%l) + set first=1 + for /f "tokens=3 delims=<>" %%a in ('findstr "[0-9].*" %cd%\pom.xml') do ( + if !first! EQU 1 (set VERSION=%%a) + set first=0 + ) ) if not defined DOCKER_REPO ( echo "set environment variable [DOCKER_REPO]" - set DOCKER_REPO='dolphinscheduler' + set DOCKER_REPO=dolphinscheduler ) echo "Version: %VERSION%" @@ -40,7 +45,7 @@ if "%errorlevel%"=="1" goto :mvnFailed :: move dolphinscheduler-bin.tar.gz file to docker/build directory echo "move %cd%\dolphinscheduler-dist\target\apache-dolphinscheduler-incubating-%VERSION%-SNAPSHOT-dolphinscheduler-bin.tar.gz %cd%\docker\build\" -move %cd%\dolphinscheduler-dist\target\apache-dolphinscheduler-incubating-%VERSION%-SNAPSHOT-dolphinscheduler-bin.tar.gz %cd%\docker\build\ +move %cd%\dolphinscheduler-dist\target\apache-dolphinscheduler-incubating-%VERSION%-dolphinscheduler-bin.tar.gz %cd%\docker\build\ :: docker build echo "docker build --build-arg VERSION=%VERSION% -t %DOCKER_REPO%:%VERSION% %cd%\docker\build\" @@ -53,4 +58,4 @@ echo "------ dolphinscheduler end - build -------" echo "MAVEN PACKAGE FAILED!" :dockerBuildFailed -echo "DOCKER BUILD FAILED!" +echo "DOCKER BUILD FAILED!" \ No newline at end of file