Merge branch 'master' into v23.02

Author: zonywhoop

Dockerfile

@@ -44,6 +44,7 @@ RUN set -x; \
         wkhtmltopdf  \
         tar \
         curl \
+        wget \
         libzip-dev \
         unzip \
     \
@@ -76,15 +77,23 @@ COPY docker-entrypoint.sh /bin/docker-entrypoint.sh
 
 RUN cd /var/www/bookstack \
     && mkdir /var/www/.composer \
-    && chown -R www-data:www-data /usr/local/etc/php/conf.d/ /var/www/bookstack /var/www/.composer 
+    && chown -R www-data:www-data /usr/local/etc/php/conf.d/ /var/www/bookstack /var/www/.composer \
+    && 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"
+
+# Install composer
+RUN php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+    && php composer-setup.php \
+    && mv composer.phar /usr/bin/composer \
+    && chmod +x /usr/bin/composer \
+    && php -r "unlink('composer-setup.php');" 
 
 # www-data
 USER 33
 
-RUN set -x; \
-    cd /var/www/bookstack \
-    && curl -sS https://getcomposer.org/installer | php -- --version=$COMPOSER_VERSION \
-    && /var/www/bookstack/composer.phar install -v -d /var/www/bookstack/ 
+# Install deps
+RUN cd /var/www/bookstack \
+    && /usr/bin/composer install -v -d /var/www/bookstack/ 
 
 WORKDIR /var/www/bookstack