Skip to content

Commit 5084120

Browse files
authored
Merge pull request #422 from solidnerd/rjh_remove_entrypoint_script
Fix issue in compose files when using default APP_KEY
2 parents fc5bea8 + 7b6ea28 commit 5084120

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

docker-compose.test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ services:
2121
- mysql
2222
environment:
2323
- APP_URL=http://localhost:${DEV_PORT:-8080}
24-
- APP_KEY=SomeRandomString
24+
- APP_KEY=SomeRandomStringWith32Characters
2525
- DB_HOST=mysql:3306
2626
- DB_DATABASE=bookstack
2727
- DB_USERNAME=bookstack

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ services:
2424
# APP_KEY is used for encryption where needed, so needs to be persisted to
2525
# preserve decryption abilities.
2626
# Can run `php artisan key:generate` to generate a key
27-
- APP_KEY=SomeRandomString
27+
- APP_KEY=SomeRandomStringWith32Characters
2828
volumes:
2929
- uploads:/var/www/bookstack/public/uploads
3030
- storage-uploads:/var/www/bookstack/storage/uploads

docker-entrypoint.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ check_vars_exist() {
1818
IFS=":" read -r DB_HOST_NAME DB_PORT <<< "$DB_HOST"
1919
DB_PORT=${DB_PORT:-3306}
2020

21-
# Ensure these is no local .env file
21+
# Ensure there is no local .env file
2222
if [ -f ".env" ]; then
2323
mv .env .env.bak
2424
echoerr ".env file detected - moved to .env.bak"

0 commit comments

Comments
 (0)