Merge remote-tracking branch 'solidnerd/master'

Dockerfile

@@ -1,5 +1,5 @@
 FROM alpine:3 as bookstack
-ENV BOOKSTACK_VERSION=23.02
+ENV BOOKSTACK_VERSION=23.02.2
 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  \

README.md

@@ -2,7 +2,7 @@
 
 Forked from https://github.com/solidnerd/docker-bookstack with more frequent updates.
 
-## Current Version: [23.02.0](https://github.com/neuroforgede/docker-bookstack/blob/master/Dockerfile)
+## Current Version: [23.2.2](https://github.com/neuroforgede/docker-bookstack/blob/master/Dockerfile)
 
 ### Changes
 
@@ -51,6 +51,7 @@ docker run -d --link bookstack_db_:mysql \
 -p 8080:8080 \
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 --name bookstack_22.04.02 \
 neuroforgede/bookstack:22.04.02
 =======
@@ -61,6 +62,10 @@ solidnerd/bookstack:22.11.0
 --name bookstack_23.02.0 \
 solidnerd/bookstack:23.02.0
 >>>>>>> solidnerd/master
+=======
+--name bookstack_23.2.2 \
+solidnerd/bookstack:23.2.2
+>>>>>>> solidnerd/master
 ```
 
 #### Docker 1.9+
@@ -93,8 +98,13 @@ docker run -d --net bookstack_nw \
 -e DB_PASSWORD=secret \
 -e APP_URL=http://example.com \
 -p 8080:8080 \
+<<<<<<< HEAD
 --name="bookstack_23.02.0" \
  neuroforgede/bookstack:23.02.0
+=======
+--name="bookstack_23.2.2" \
+ solidnerd/bookstack:23.2.2
+>>>>>>> solidnerd/master
 ```
 
 The APP_URL parameter should be the base URL for your BookStack instance without a trailing slash. For example:

VERSION

@@ -1 +1 @@
-23.1.1
+23.2.2

docker-compose.yml

@@ -11,7 +11,7 @@ services:
     - mysql-data:/var/lib/mysql
 
   bookstack:
-    image: ghcr.io/neuroforgede/docker-bookstack:23.1.1
+    image: ghcr.io/neuroforgede/docker-bookstack:23.2.2
     depends_on:
     - mysql
     environment: