Merge remote-tracking branch 'solidnerd/master'

Dockerfile

@@ -1,13 +1,13 @@
 FROM alpine:3 as bookstack
-ENV BOOKSTACK_VERSION=23.08.2
+ENV BOOKSTACK_VERSION=23.12.1
 RUN apk add --no-cache curl tar
 RUN set -x; \
     curl -SL -o bookstack.tar.gz https://github.com/BookStackApp/BookStack/archive/v${BOOKSTACK_VERSION}.tar.gz  \
     && mkdir -p /bookstack \
     && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \
     && rm bookstack.tar.gz
 
-FROM php:8.2-apache-bookworm as final
+FROM php:8.3-apache-bookworm as final
 RUN set -x; \
     apt-get update \
     && apt-get install -y --no-install-recommends \

README.md

@@ -65,8 +65,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    ```bash
    docker run -d --link bookstack_db_:mysql \
    -p 8080:8080 \
-   --name bookstack_23.8.2 \
-   solidnerd/bookstack:23.8.2
+   --name bookstack_23.12.1 \
+   solidnerd/bookstack:23.12.1
    ```
 
 ### Docker 1.9+
@@ -99,8 +99,8 @@ Networking changed in Docker v1.9, so you need to do one of the following steps.
    -e DB_PASSWORD=secret \
    -e APP_URL=http://example.com \
    -p 8080:8080 \
-   --name="bookstack_23.8.2" \
-    solidnerd/bookstack:23.8.2
+   --name="bookstack_23.12.1" \
+    solidnerd/bookstack:23.12.1
    ```
 
     The APP_URL parameter should be the base URL for your BookStack instance without

VERSION

@@ -1 +1 @@
-23.8.2
+23.12.1

docker-compose.test.yml

@@ -6,7 +6,7 @@ services:
     depends_on:
     - bookstack
   mysql:
-    image: mysql:8.1
+    image: mysql:8.2
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
   mysql:
-    image: mysql:8.1
+    image: mysql:8.2
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack
@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: ghcr.io/neuroforgede/docker-bookstack:23.08.2
+    image: ghcr.io/neuroforgede/docker-bookstack:23.12.1
     depends_on:
     - mysql
     environment:

docker-entrypoint.sh

@@ -35,6 +35,13 @@ check_vars_exist \
   DB_PORT \
   DB_USERNAME
 
+if [ -n "${FILE_UPLOAD_SIZE_LIMITS}" ]; then
+  echo "Note: If you're setting FILE_UPLOAD_SIZE_LIMITS to more than 10M, you"
+  echo "may also need to modify the php.ini file."
+  echo "See:"
+  echo "https://github.com/solidnerd/docker-bookstack/issues/423"
+fi
+
 echoerr "wait-for-db: waiting for ${DB_HOST_NAME}:${DB_PORT}"
 
 timeout 15 bash <<EOT