Shikong/HFish
1
0
Fork 0
mirror of https://gitee.com/lauix/HFish synced 2025-05-10 20:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
SanJin 2019-09-15 20:41:47 +08:00
commit e827964abb
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dockerfile/Dockerfile
View File

@ -1,11 +1,11 @@
FROM alpine:latest
ENV GLIBC_VERSION 2.29-r0
ENV HFISH_VERSION 0.3
ENV HFISH_VERSION 0.3.1
# Download and install glibc
RUN apk update && \
apk add --no-cache curl tzdata && \
apk add --no-cache curl tzdata mysql-client && \
cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && \
curl -Lo /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
curl -Lo glibc.apk "https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VERSION}/glibc-${GLIBC_VERSION}.apk" && \
@ -24,5 +24,6 @@ RUN chmod +x /Entrypoint.sh
EXPOSE 21 22 23 3306 6379 7879 8080 8989 9000 9001 11211
ENTRYPOINT ["/Entrypoint.sh"]
WORKDIR /opt
ENTRYPOINT ["/Entrypoint.sh"]

13
dockerfile/Entrypoint.sh
View File

@ -5,7 +5,6 @@ HFISH_DIR=/opt/HFish
if [ ! -d $HFISH_DIR ];then
mv /tmp/HFish $HFISH_DIR
sed -i "s/status = 0/status = 1/g" $HFISH_DIR/config.ini
sed -i "s/127.0.0.1/0.0.0.0/g" $HFISH_DIR/config.ini
fi
if [ ! -z "$CLUSTER_IP" ];then
@ -25,5 +24,15 @@ if [ ! -z "$PASSWORD" ];then
sed -i "s/password = admin/password = $PASSWORD/" $HFISH_DIR/config.ini
fi
cd $HFISH_DIR && ./HFish run
if [ ! -z "$MYSQL_USER" ] && [ ! -z "$MYSQL_PASSWORD" ] && [ ! -z "$MYSQL_IP" ] && [ ! -z "$MYSQL_PORT" ] && [ ! -z "$MYSQL_DATABASE" ];then
sed -i "s/db_type = sqlite/db_type = mysql/" $HFISH_DIR/config.ini
sed -i "s#^db_str = .*rwc#db_str = $MYSQL_USER:$MYSQL_PASSWORD@tcp\($MYSQL_IP:$MYSQL_PORT\)\/$MYSQL_DATABASE\?charset=utf8\&parseTime=true\&loc=Local#" $HFISH_DIR/config.ini
if [ ! -f $HFISH_DIR/db/sql/import_sql.log ];then
mysql -h $MYSQL_IP -P $MYSQL_PORT -u$MYSQL_USER -p$MYSQL_PASSWORD -D $MYSQL_DATABASE < $HFISH_DIR/db/sql/hfish_colony.sql &&
mysql -h $MYSQL_IP -P $MYSQL_PORT -u$MYSQL_USER -p$MYSQL_PASSWORD -D $MYSQL_DATABASE < $HFISH_DIR/db/sql/hfish_info.sql &&
mysql -h $MYSQL_IP -P $MYSQL_PORT -u$MYSQL_USER -p$MYSQL_PASSWORD -D $MYSQL_DATABASE < $HFISH_DIR/db/sql/hfish_setting.sql &&
echo "SQL import time: `date "+%Y-%m-%d %H:%M:%S"`" > $HFISH_DIR/db/sql/import_sql.log
fi
fi
cd $HFISH_DIR && ./HFish run