From e964eaf80eeaf3a127a73fc3f4f2f7e3f2371c1d Mon Sep 17 00:00:00 2001 From: fanxb Date: Tue, 16 Jul 2019 15:55:05 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix:=20[=E9=83=A8=E7=BD=B2]:?= =?UTF-8?q?=E4=BF=AE=E6=94=B9init.sh=E6=8D=A2=E8=A1=8C=E7=AC=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookMarkDocker/init.sh | 22 +++++++++++----------- front/.editorconfig | 5 +++++ 2 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 front/.editorconfig diff --git a/bookMarkDocker/init.sh b/bookMarkDocker/init.sh index ec098f1..b3ebee1 100755 --- a/bookMarkDocker/init.sh +++ b/bookMarkDocker/init.sh @@ -1,11 +1,11 @@ -#/bin/bash -base=$(cd "$(dirname "$0")";pwd) -echo $base - -# 用于前后端打包 - -#docker run -it --rm --name buildBookmark -v $base/../front:/opt/front registry.cn-hangzhou.aliyuncs.com/fleyx/node-java-env:v1 sh -c "cd /opt/front && npm --registry https://registry.npm.taobao.org install && npm run build" - -docker run -it --rm --name buildBookmark -v $base/mavenRep:/opt/mavenRep -v $base/../bookMarkService:/opt/backend registry.cn-hangzhou.aliyuncs.com/fleyx/node-java-env:v1 sh -c "cd /opt/backend && mvn clean install && echo over" - -echo "打包完毕，export MYSQL_PASS=xxx 设置环境变量后执行docker-compose up -d即可" +#/bin/bash +base=$(cd "$(dirname "$0")";pwd) +echo $base + +# 用于前后端打包 + +docker run -it --rm --name buildBookmark -v $base/../front:/opt/front registry.cn-hangzhou.aliyuncs.com/fleyx/node-java-env:v1 sh -c "cd /opt/front && npm --registry https://registry.npm.taobao.org install && npm run build" + +docker run -it --rm --name buildBookmark -v $base/mavenRep:/opt/mavenRep -v $base/../bookMarkService:/opt/backend registry.cn-hangzhou.aliyuncs.com/fleyx/node-java-env:v1 sh -c "cd /opt/backend && mvn clean install && echo over" + +echo "打包完毕，export MYSQL_PASS=xxx 设置环境变量后执行docker-compose up -d即可" diff --git a/front/.editorconfig b/front/.editorconfig new file mode 100644 index 0000000..53894cc --- /dev/null +++ b/front/.editorconfig @@ -0,0 +1,5 @@ +root = true +[*] +end_of_line = lf +insert_final_newline = true +tab_width = 2 \ No newline at end of file