ehlxr/did
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

change package
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
ehlxr
2021-01-22 15:40:02 +08:00
parent d0d9a5b7ce
commit 461db897b2
29 changed files with 106 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
docker/build.sh
View File

@@ -3,7 +3,7 @@
set -e
echo "############## start ##############"
BUILD_DATE=`date +%Y-%m-%d:%H:%M:%S`
BUILD_DATE=$(date +%Y-%m-%d:%H:%M:%S)
#CURR_DIR=`basename $PWD`
#if [[ ${CURR_DIR} != "docker" ]]; then
@@ -18,21 +18,21 @@ SERVER_NAME=${MODULE_PARMS}
SERVER_JAR=$PWD/${MODULE_PARMS}/target/${SERVER_NAME}*.jar
#if [ ! -n "ls ${SERVER_JAR} >/dev/null 2>&1" ]; then
if [[ "`echo ${SERVER_JAR}`" != "${SERVER_JAR}" ]]; then
echo exist ${SERVER_JAR} skip maven build.
if [[ "$(echo ${SERVER_JAR})" != "${SERVER_JAR}" ]]; then
echo exist ${SERVER_JAR} skip maven build.
else
mvn clean install -DskipTests
mvn clean install -DskipTests
fi
cp ${SERVER_JAR} ./docker
#cd docker
if [[ ${DOCKER_IMAGE_TAG} ]];then
image_tag=${DOCKER_IMAGE_TAG}
if [[ ${DOCKER_IMAGE_TAG} ]]; then
image_tag=${DOCKER_IMAGE_TAG}
else
echo "############## DOCKER_IMAGE_TAG is null ! ##############"
# image_tag=$(git symbolic-ref --short -q HEAD)
image_tag=`date "+%Y%m%d_%H%M%S"`
echo "############## DOCKER_IMAGE_TAG is null ! ##############"
# image_tag=$(git symbolic-ref --short -q HEAD)
image_tag=$(date "+%Y%m%d_%H%M%S")
fi
echo "############## image_tag is: ${image_tag} ##############"
@@ -50,6 +50,6 @@ echo "############## build & push finish: ${BUILD_DATE} ##############"
err=$?
if [[ "$err" -ne "0" ]]; then
echo "############## build error ! ##############"
exit 1
fi
echo "############## build error ! ##############"
exit 1
fi

8
docker/start.sh
View File

@@ -7,14 +7,14 @@ LOGS_DIR="/data/logs"
GC_LOGS_DIR="/data/gc"
if [[ ! -d ${LOGS_DIR} ]]; then
mkdir -p ${LOGS_DIR}
mkdir -p ${LOGS_DIR}
fi
if [[ ! -d ${GC_LOGS_DIR} ]]; then
mkdir -p ${GC_LOGS_DIR}
mkdir -p ${GC_LOGS_DIR}
fi
STDOUT_FILE=${LOGS_DIR}/${SERVER_NAME}.log
CURRENT=`date "+%Y%m%d%H%M%S"`
CURRENT=$(date "+%Y%m%d%H%M%S")
#JAVA_OPTS=" -Duser.timezone=\"Asia/Shanghai\" -Djava.awt.headless=true -Djava.net.preferIPv4Stack=true -Dfile.encoding=UTF8"
@@ -30,4 +30,4 @@ JAVA_MEM_OPTS=" -server -XX:+PrintGCDetails -XX:+PrintGCTimeStamps -Xloggc:${GC_
echo "Starting the ${SERVER_NAME} ...\c"
chmod -R 755 ./${SERVER_NAME}*.jar
#java -jar ${JAVA_OPTS} ${JAVA_MEM_OPTS} ./${SERVER_NAME}*.jar > ${STDOUT_FILE} 2>&1
java -jar ${JAVA_MEM_OPTS} ./${SERVER_NAME}*.jar | tee -a ${STDOUT_FILE} 2>&1
java -jar ${JAVA_MEM_OPTS} ./${SERVER_NAME}*.jar | tee -a ${STDOUT_FILE} 2>&1