From 961babb46faf5aec74c406758b18d940a14a2627 Mon Sep 17 00:00:00 2001 From: SimpleYoungMan Date: Tue, 29 Oct 2019 17:19:31 +0800 Subject: [PATCH] update docker-compose and readme --- docker-compose.yml | 4 ++-- readme.md | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 68ff5987..b7097945 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,10 +2,10 @@ version: '3' services: db: - container_name: v2board-db image: mysql + command: --default-authentication-plugin=mysql_native_password environment: - - MYSQL_ALLOW_EMPTY_PASSWORD=true + - MYSQL_ROOT_PASSWORD=123456 volumes: - ./docker/mysql:/var/lib/mysql - ./install.sql:/install.sql diff --git a/readme.md b/readme.md index e42b4e55..2126fbdf 100755 --- a/readme.md +++ b/readme.md @@ -32,5 +32,8 @@ > docker run --rm -v $(pwd):/app composer install > docker run --rm -v $(pwd):/app composer sh init.sh > ``` -2. 进入 docker 容器从 `install.sql` 文件中恢复表 +2. 执行 `docker-compose run --rm db` 进入 docker 容器从 `install.sql` 文件中恢复表后执行 `docker-compose down` 3. 执行 `docker-compose up -d` 启动服务 + +## 注意 +每次修改 `.env` 文件后需要执行 `docker run --rm -v $(pwd):/app composer sh init.sh`