Merge pull request #422 from solidnerd/rjh_remove_entrypoint_script

Fix issue in compose files when using default APP_KEY
solidnerd · Jul 20, 2023 · 5084120 · 5084120
2 parents fc5bea8 + 7b6ea28
commit 5084120
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
@@ -21,7 +21,7 @@ services:
     - mysql
     environment:
     - APP_URL=http://localhost:${DEV_PORT:-8080}
-    - APP_KEY=SomeRandomString
+    - APP_KEY=SomeRandomStringWith32Characters
     - DB_HOST=mysql:3306
     - DB_DATABASE=bookstack
     - DB_USERNAME=bookstack

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -24,7 +24,7 @@ services:
     # APP_KEY is used for encryption where needed, so needs to be persisted to
     # preserve decryption abilities.
     # Can run `php artisan key:generate` to generate a key
-    - APP_KEY=SomeRandomString
+    - APP_KEY=SomeRandomStringWith32Characters
     volumes:
     - uploads:/var/www/bookstack/public/uploads
     - storage-uploads:/var/www/bookstack/storage/uploads

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -18,7 +18,7 @@ check_vars_exist() {
 IFS=":" read -r DB_HOST_NAME DB_PORT <<< "$DB_HOST"
 DB_PORT=${DB_PORT:-3306}
 
-# Ensure these is no local .env file
+# Ensure there is no local .env file
 if [ -f ".env" ]; then
   mv .env .env.bak
   echoerr ".env file detected - moved to .env.bak"