diff --git a/docker-compose.yml b/docker-compose.yml index 3713746..bae184b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -33,9 +33,8 @@ services: MYSQL_USER: ${DB_USERNAME:-investbrain} MYSQL_PASSWORD: ${DB_PASSWORD:-investbrain} MYSQL_ROOT_PASSWORD: ${DB_PASSWORD:-investbrain} - command: --cte-max-recursion-depth=1000 + command: bash -c "echo -e '[mysqld]\ncte_max_recursion_depth = 25000' > /etc/mysql/conf.d/my.cnf && docker-entrypoint.sh mysqld" volumes: - # - ./docker/mysql.conf:/etc/mysql/conf.d/my.cnf - investbrain-mysql:/var/lib/mysql networks: - investbrain-network diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 2b54876..78d9d10 100644 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -18,9 +18,19 @@ run_as_www_user() { } if ( ! grep -q "^APP_KEY=" ".env" || grep -q "^APP_KEY=$" ".env"); then - echo " > Ah, APP_KEY is missing in .env file. Generating a new key!" - - run_as_www_user "key:generate --force" + echo " > The required APP_KEY configuration is missing in your .env file. Copy and paste this key into your .env file. Then restart the container!" + + draw_box() { + local text="$1" + local length=${#text} + local border=$(printf '%*s' "$((length + 4))" | tr ' ' '*') + + echo "*$border*" + echo "* $text *" + echo "*$border*" + } + + draw_box "base64:$(openssl rand -base64 32)" fi if [ ! -L "public/storage" ]; then