From ecf3d70ad35cd6b2adb6a6ee84bc4a69fdb35063 Mon Sep 17 00:00:00 2001
From: reddexx <killmaster-loc@hotmail.de>
Date: Wed, 15 Dec 2021 15:14:18 +0100
Subject: [PATCH 1/2] Update Dockerfile

---
 Dockerfile | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 21938e7d..b9486389 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM alpine:3 as bookstack
-ENV BOOKSTACK_VERSION=21.05.2
+ENV BOOKSTACK_VERSION=21.11.3
 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  \
@@ -7,7 +7,7 @@ RUN set -x; \
     && tar xvf bookstack.tar.gz -C /bookstack --strip-components=1 \
     && rm bookstack.tar.gz
 
-FROM php:7.4-apache-buster as final
+FROM php:8.0-apache-buster as final
 RUN set -x; \
     apt-get update \
     && apt-get install -y --no-install-recommends \
@@ -51,13 +51,11 @@ COPY bookstack.conf /etc/apache2/sites-available/000-default.conf
 
 COPY --from=bookstack --chown=33:33 /bookstack/ /var/www/bookstack/
 
-ARG COMPOSER_VERSION=1.10.16
+ARG COMPOSER_VERSION=2.1.12
 RUN set -x; \
     cd /var/www/bookstack \
     && curl -sS https://getcomposer.org/installer | php -- --version=$COMPOSER_VERSION \
-    && /var/www/bookstack/composer.phar global -v require hirak/prestissimo \
     && /var/www/bookstack/composer.phar install -v -d /var/www/bookstack/ \
-    && /var/www/bookstack/composer.phar global -v remove hirak/prestissimo \
     && rm -rf /var/www/bookstack/composer.phar /root/.composer \
     && chown -R www-data:www-data /var/www/bookstack
 

From 40e765bd764a7f670656cc52c32e5a554551ed8d Mon Sep 17 00:00:00 2001
From: solidnerd <niclas@mietz.io>
Date: Tue, 21 Dec 2021 23:45:32 +0100
Subject: [PATCH 2/2] fix(ci): specify APP_URL

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

diff --git a/.dockerignore b/.dockerignore
index e91689fa..95fb3c5d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -2,3 +2,5 @@ README.md
 LICENCE
 .git
 docker-compose.yml
+Dockerfile
+.github
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index baa448fd..71e50543 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -6,7 +6,7 @@ services:
     depends_on:
     - bookstack
   mysql:
-    image: mysql:5.7.33
+    image: mysql:8.0
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack
@@ -20,6 +20,7 @@ services:
     depends_on:
     - mysql
     environment:
+    - APP_URL=http://localhost:${DEV_PORT:-8080}
     - DB_HOST=mysql:3306
     - DB_DATABASE=bookstack
     - DB_USERNAME=bookstack
diff --git a/docker-compose.yml b/docker-compose.yml
index d48cd9a8..76fc41b0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2'
 services:
   mysql:
-    image: mysql:5.7.33
+    image: mysql:8.0
     environment:
     - MYSQL_ROOT_PASSWORD=secret
     - MYSQL_DATABASE=bookstack