diff --git a/README.md b/README.md index 7954902..1a73dde 100644 --- a/README.md +++ b/README.md @@ -155,11 +155,14 @@ flask new --type view --name test/a #### 使用docker-compose运行项目 ```bash +git clone https://gitee.com/pear-admin/pear-admin-flask + #安装docker-compose curl -L https://github.com/docker/compose/releases/download/1.26.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose +chmod -R 777 dockerdata/mysql/ docker-compose --version docker-compose up -d # -d后台运行 docker-compose stop # 停止启动 @@ -167,7 +170,7 @@ docker-compose down # 清除容器 dockerdata/config.py # 配置文件 dockerdata/mysql/initdb/ # MySQL初始化数据在 -rm -rf dockerdata/mysql/{log,data}/* # down掉容器后启动需要清除删除log,dat +rm -rf dockerdata/mysql/data/* # down掉容器后启动需要清除删除data ``` Pear Admin Flask 还有以下几个版本: diff --git a/docker-compose.yml b/docker-compose.yml index 73aa0fb..7d412a1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,14 +7,17 @@ services: ports: - "3306:3306" volumes: - - "./dockerdata/mysql/log:/usr/local/mysql/log" - "./dockerdata/mysql/data:/var/lib/mysql" - - "./dockerdata/mysql/my.cnf:/etc/my.cnf" - "./dockerdata/mysql/initdb:/docker-entrypoint-initdb.d" environment: LANG: C.UTF-8 TZ: Asia/Shanghai MYSQL_ROOT_PASSWORD: 123456 + + command: [ + '--character-set-server=utf8mb4', + '--collation-server=utf8mb4_unicode_ci', + ] networks: flask-network: ipv4_address: 172.10.1.31 diff --git a/dockerdata/mysql/initdb/init.sql b/dockerdata/mysql/initdb/init.sql old mode 100644 new mode 100755 index d14679a..3cfad21 --- a/dockerdata/mysql/initdb/init.sql +++ b/dockerdata/mysql/initdb/init.sql @@ -1 +1 @@ -CREATE DATABASE PearAdminFlask; +CREATE DATABASE PearAdminFlask DEFAULT CHARSET utf8mb4 COLLATE utf8mb4_general_ci;; diff --git a/dockerdata/start.sh b/dockerdata/start.sh index e6e643d..4773b57 100644 --- a/dockerdata/start.sh +++ b/dockerdata/start.sh @@ -1,7 +1,8 @@ #!/bin/sh -sleep 5 #等MySQL启动 +sleep 5 +rm -rf migrations flask db init && flask db migrate && flask db upgrade && flask admin init -exec gunicorn -c gunicorn.conf.py "applications:create_app() --preload" +exec gunicorn -c gunicorn.conf.py "applications:create_app()" while true; do echo '发生错误' sleep 100