diff --git a/.env.dist b/.env.dist index 2eba61c..4f68ef9 100644 --- a/.env.dist +++ b/.env.dist @@ -21,11 +21,13 @@ APP_SECRET=9e287f1ad737386dde46d51e80487236 ###> docker ### SERVER_NAME=localhost MYSQL_DATABASE=unfold_db +MYSQL_VERSION=8.0 +MYSQL_CHARSET=utf8mb4 MYSQL_USER=unfold_user MYSQL_PASSWORD=password +# Root password is only used for the bundled database service, see compose.yaml +# skip it, if you use your own MYSQL_ROOT_PASSWORD=root_password -MYSQL_VERSION=8.0 -MYSQL_CHARSET=utf8mb4 ###< docker ### ###> doctrine/doctrine-bundle ### diff --git a/README.md b/README.md index 852ee8e..eebfbfb 100644 --- a/README.md +++ b/README.md @@ -15,3 +15,5 @@ cd unfold Copy the example file `.env.dist` and replace placeholders with your actual configuration. +If you have your own MySQL database, comment out the database service in `compose.yaml` and skip root password in `.env`. +There are additional comments to that effect in the files. diff --git a/compose.yaml b/compose.yaml index cc7b6fa..d384791 100644 --- a/compose.yaml +++ b/compose.yaml @@ -28,6 +28,10 @@ services: ###> doctrine/doctrine-bundle ### + # --- + # The database service below is optional. If you use your own database (container or external), + # you can comment out or remove this block. Make sure to update the DATABASE_URL in the php service accordingly. + # --- database: image: mysql:${MYSQL_VERSION:-8.0} environment: