From aa5e29d1adcb64cc2496452bd2730c295dcb2333 Mon Sep 17 00:00:00 2001 From: fanxb Date: Fri, 26 Jul 2019 17:53:09 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=80=20Deploy:=20[=E9=83=A8=E7=BD=B2]:?= =?UTF-8?q?=E8=AE=BE=E7=BD=AEmaven=E7=BC=96=E7=A0=81=E4=B8=BAutf8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bookMarkDocker/es/elasticsearch.yml | 2 +- bookMarkDocker/init.sh | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bookMarkDocker/es/elasticsearch.yml b/bookMarkDocker/es/elasticsearch.yml index 1e629c1..05a48db 100644 --- a/bookMarkDocker/es/elasticsearch.yml +++ b/bookMarkDocker/es/elasticsearch.yml @@ -14,7 +14,7 @@ bootstrap.memory_lock: false # 设置为true来锁住内存不进行swapping。因为当jvm开始swapping时es的效率 会降低，所以要保证它不swap，可以把ES_MIN_MEM和ES_MAX_MEM两个环境变量设置成同一个值，并且保证机器有足够的内存分配给es。 同时也要允许elasticsearch的进程可以锁住内# # 存，linux下启动es之前可以通过`ulimit -l unlimited`命令设置。 # 设置为true，导致报警告实际未锁定，进而推出进程 -#network.bind_host: 192.168.0.1 +network.bind_host: 0.0.0.0 # 设置绑定的ip地址，可以是ipv4或ipv6的，默认为0.0.0.0，绑定这台机器的任何一个ip。 #network.publish_host: 192.168.0.1 diff --git a/bookMarkDocker/init.sh b/bookMarkDocker/init.sh index b3ebee1..caae807 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 -e MAVEN_OPTS="-Xms256m -Xmx512m -Dfile.encoding=UTF-8" 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即可"