diff --git a/script/assembly/server/assembly.xml b/script/assembly/server/assembly.xml index 91d5399..b286a39 100644 --- a/script/assembly/server/assembly.xml +++ b/script/assembly/server/assembly.xml @@ -6,7 +6,7 @@ http://maven.apache.org/ASSEMBLY/2.0.0 "> 1.0 - tar.gz + tar zip diff --git a/script/assembly/server/bin/entrypoint.sh b/script/assembly/server/bin/entrypoint.sh new file mode 100644 index 0000000..2291d3b --- /dev/null +++ b/script/assembly/server/bin/entrypoint.sh @@ -0,0 +1,44 @@ +#!/bin/sh + +# 项目名称 +SERVER_NAME="${project.build.finalName}" + +# jar名称 +JAR_NAME="${project.build.finalName}.jar" + +# 进入bin目录 +cd `dirname $0` +# bin目录绝对路径 +BIN_DIR=`pwd` +# 返回到上一级项目根目录路径 +cd .. +# 打印项目根目录绝对路径 +# `pwd` 执行系统命令并获得结果 +DEPLOY_DIR=`pwd` + +# 外部配置文件绝对目录,如果是目录需要/结尾,也可以直接指定文件 +# 如果指定的是目录,spring则会读取目录中的所有配置文件 +CONF_DIR=$DEPLOY_DIR/config + +# 项目日志输出绝对路径 +LOGS_DIR=$DEPLOY_DIR/logs +# 如果logs文件夹不存在,则创建文件夹 +if [ ! -d $LOGS_DIR ]; then + mkdir $LOGS_DIR +fi + +# JVM Configuration +JAVA_OPTS=" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true " + +JAVA_MEM_OPTS=" -server -Xms512m -Xmx512m -XX:SurvivorRatio=2 -XX:+UseParallelGC " + +# 加载外部log文件的配置 +LOG_IMPL_FILE=logback-spring.xml +LOGGING_CONFIG="" +if [ -f "$CONF_DIR/$LOG_IMPL_FILE" ] +then + LOGGING_CONFIG="-Dlogging.config=$CONF_DIR/$LOG_IMPL_FILE" +fi +CONFIG_FILES=" -Dlogging.path=$LOGS_DIR $LOGGING_CONFIG -Dspring.config.location=$CONF_DIR/ " +echo -e "Starting the $SERVER_NAME ..." +java $JAVA_OPTS $JAVA_MEM_OPTS $CONFIG_FILES -jar $DEPLOY_DIR/$JAR_NAME --spring.profiles.active=prod \ No newline at end of file diff --git a/script/docker/server/Dockerfile b/script/docker/server/Dockerfile index 7eac0c5..4963f31 100644 --- a/script/docker/server/Dockerfile +++ b/script/docker/server/Dockerfile @@ -2,10 +2,10 @@ FROM openjdk:8-alpine MAINTAINER tomsun28 "tomsun28@outlook.com" -ADD tancloud-server-1.0.tar /opt/ +ADD hertz-beat-1.0.tar /opt/ -EXPOSE 1158 +EXPOSE 1157 -WORKDIR /opt/tancloud-server/ +WORKDIR /opt/hertz-beat/ ENTRYPOINT ["./bin/entrypoint.sh"]