From: Dan Brown <redacted>
Date: Sun, 1 Dec 2024 16:02:21 +0000 (+0000)
Subject: Dev Docker: Fixed missing gd jpeg handling, forced migrations
X-Git-Tag: v24.12~1^2~20^2
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/227c5e155b60ba9a442d23c64a9846366c3e15ac

Dev Docker: Fixed missing gd jpeg handling, forced migrations

Migrations run without force could fail startup in certain environment
conditions (when testing production env).
Also updated paths permission handling to update more needed locations.
---

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 9f283c755..edab90ca1 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -6,15 +6,18 @@ RUN apt-get update && \
         git \
         zip \
         unzip \
-        libpng-dev \
+        libfreetype-dev \
+        libjpeg62-turbo-dev \
         libldap2-dev \
+        libpng-dev \
         libzip-dev \
         wait-for-it && \
     rm -rf /var/lib/apt/lists/*
 
 # Install PHP extensions
 RUN docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)" && \
-    docker-php-ext-install pdo_mysql gd ldap zip && \
+    docker-php-ext-configure gd --with-freetype --with-jpeg && \
+    docker-php-ext-install -j$(nproc) pdo_mysql gd ldap zip && \
     pecl install xdebug && \
     docker-php-ext-enable xdebug
 
diff --git a/dev/docker/entrypoint.app.sh b/dev/docker/entrypoint.app.sh
index e91d34a71..b09edda88 100755
--- a/dev/docker/entrypoint.app.sh
+++ b/dev/docker/entrypoint.app.sh
@@ -9,7 +9,7 @@ if [[ -n "$1" ]]; then
 else
     composer install
     wait-for-it db:3306 -t 45
-    php artisan migrate --database=mysql
-    chown -R www-data:www-data storage
+    php artisan migrate --database=mysql --force
+    chown -R www-data storage public/uploads bootstrap/cache
     exec apache2-foreground
 fi
diff --git a/dev/docs/development.md b/dev/docs/development.md
index 3c7a6e9d2..0324140f8 100644
--- a/dev/docs/development.md
+++ b/dev/docs/development.md
@@ -82,7 +82,7 @@ If all the conditions are met, you can proceed with the following steps:
 
 1. **Copy `.env.example` to `.env`**, change `APP_KEY` to a random 32 char string and set `APP_ENV` to `local`.
 2. Make sure **port 8080 is unused** *or else* change `DEV_PORT` to a free port on your host.
-3. **Run `chgrp -R docker storage`**. The development container will chown the `storage` directory to the `www-data` user inside the container so BookStack can write to it. You need to change the group to your host's `docker` group here to not lose access to the `storage` directory.
+3. **Run `chgrp -R docker storage`**. The development container will chown the `storage`, `public/uploads` and `bootstrap/cache` directories to the `www-data` user inside the container so BookStack can write to it. You need to change the group to your host's `docker` group here to not lose access to the `storage` directory.
 4. **Run `docker-compose up`** and wait until the image is built and all database migrations have been done.
 5. You can now login with `admin@admin.com` and `password` as password on `localhost:8080` (or another port if specified).