Fixed OIDC Logout

[bookstack] / dev / docker / Dockerfile

diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 8816615cf69986b75a3713d02e80b5a283221d13..349e315d2e3e98eed79ef08e9c3fc0e83d10e980 100644 (file)
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -1,16 +1,25 @@
-FROM php:7.3-apache
+FROM php:8.1-apache

 
 ENV APACHE_DOCUMENT_ROOT /app/public
 WORKDIR /app
 
 
 ENV APACHE_DOCUMENT_ROOT /app/public
 WORKDIR /app
 

+# Install additional dependacnies and configure apache

 RUN apt-get update -y \
 RUN apt-get update -y \

-    && apt-get install -y git zip unzip libtidy-dev libpng-dev libldap2-dev libxml++2.6-dev wait-for-it \
-    && docker-php-ext-configure ldap --with-libdir=lib/x86_64-linux-gnu \
-    && docker-php-ext-install pdo pdo_mysql tidy dom xml mbstring gd ldap \
+    && apt-get install -y git zip unzip libpng-dev libldap2-dev libzip-dev wait-for-it \
+    && docker-php-ext-configure ldap --with-libdir="lib/$(gcc -dumpmachine)" \
+    && docker-php-ext-install pdo_mysql gd ldap zip \
+    && pecl install xdebug \
+    && docker-php-ext-enable xdebug \

     && a2enmod rewrite \
     && sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \
     && a2enmod rewrite \
     && sed -ri -e 's!/var/www/html!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/sites-available/*.conf \

-    && sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf \
-    && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && sed -ri -e 's!/var/www/!${APACHE_DOCUMENT_ROOT}!g' /etc/apache2/apache2.conf /etc/apache2/conf-available/*.conf
+
+# Install composer
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \

     && php composer-setup.php \
     && mv composer.phar /usr/bin/composer \
     && php -r "unlink('composer-setup.php');"
     && php composer-setup.php \
     && mv composer.phar /usr/bin/composer \
     && php -r "unlink('composer-setup.php');"

+
+# Use the default production configuration and update it as required
+RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
+    && sed -i 's/memory_limit = 128M/memory_limit = 512M/g' "$PHP_INI_DIR/php.ini"