This is an automated email from the ASF dual-hosted git repository.
chenxingchun pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 467d9f5 [Fix-3124][Docker] Fix that can not build a docker image on
Windows
new fd581af Merge pull request #4977 from
chengshiwen/fix-docker-image-build-on-windows
467d9f5 is described below
commit 467d9f5681bfd58ff75d28081ccf7a6ea54177e1
Author: chengshiwen <[email protected]>
AuthorDate: Fri Mar 5 23:40:12 2021 +0800
[Fix-3124][Docker] Fix that can not build a docker image on Windows
---
docker/build/hooks/build | 5 ++---
docker/build/hooks/build.bat | 11 ++++++++---
docker/build/hooks/push | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/docker/build/hooks/build b/docker/build/hooks/build
index 40bf74d..b9ffa08 100755
--- a/docker/build/hooks/build
+++ b/docker/build/hooks/build
@@ -24,8 +24,7 @@ printenv
if [ -z "${VERSION}" ]
then
echo "set default environment variable [VERSION]"
- VERSION=$(grep '<revision>' -m 1 "$(pwd)"/pom.xml | awk '{print $1}' | sed
's/<revision>//' | sed 's/<\/revision>//')
- export VERSION
+ export VERSION=$(cat $(pwd)/pom.xml | grep '<revision>' -m 1 | awk '{print
$1}' | sed 's/<revision>//' | sed 's/<\/revision>//')
fi
if [ "${DOCKER_REPO}x" = "x" ]
@@ -45,7 +44,7 @@ mvn -B clean compile package -Prelease -Dmaven.test.skip=true
# mv dolphinscheduler-bin.tar.gz file to docker/build directory
echo -e "mv
$(pwd)/dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${VERSION}-dolphinscheduler-bin.tar.gz
$(pwd)/docker/build/\n"
-mv
"$(pwd)"/dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-"${VERSION}"-dolphinscheduler-bin.tar.gz
$(pwd)/docker/build/
+mv
$(pwd)/dolphinscheduler-dist/target/apache-dolphinscheduler-incubating-${VERSION}-dolphinscheduler-bin.tar.gz
$(pwd)/docker/build/
# docker build
BUILD_COMMAND="docker build --build-arg VERSION=${VERSION} -t
$DOCKER_REPO:${VERSION} $(pwd)/docker/build/"
diff --git a/docker/build/hooks/build.bat b/docker/build/hooks/build.bat
index fd7c9b5..7947a63 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
"<revision>[0-9].*</revision>" %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\"
diff --git a/docker/build/hooks/push b/docker/build/hooks/push
index 74ea06d..41a25c5 100755
--- a/docker/build/hooks/push
+++ b/docker/build/hooks/push
@@ -19,6 +19,6 @@
echo "------ push start -------"
printenv
-docker push "$DOCKER_REPO:${VERSION}"
+docker push $DOCKER_REPO:${VERSION}
echo "------ push end -------"
