From 7bc73ba9360db25cd87534a25c08095a78edd760 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Thu, 20 Jul 2023 17:27:07 +0100
Subject: [PATCH 1/2] Fix bad APP_KEY in Docker Compose files

---
 docker-compose.test.yml | 2 +-
 docker-compose.yml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 55dc831..61d5939 100644
--- 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
index 6fe713f..11c35e1 100644
--- 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

From 7b6ea282a48d1baa87c778990d0d78a44f9ff614 Mon Sep 17 00:00:00 2001
From: Rick Henry <rjh@rickhenry.uk>
Date: Thu, 20 Jul 2023 17:28:52 +0100
Subject: [PATCH 2/2] Fix typo in Dockerfile

---
 docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index b1e93d8..f0fa624 100755
--- 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"