From b3156e9798de405259bc1be91a2136a45f183d90 Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 10 Aug 2019 06:16:50 +0200 Subject: [PATCH] New command for php config in ARM image. --- Dockerfile.arm | 9 ++++++--- Dockerfile.arm64 | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Dockerfile.arm b/Dockerfile.arm index a389aad123..423bfaecff 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -1,4 +1,4 @@ -FROM arm32v7/php:7.2.8-apache-stretch +FROM arm32v7/php:7.2-apache-stretch ARG ARCH COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1 @@ -29,8 +29,11 @@ RUN docker-php-ext-configure ldap --with-libdir=lib/$(gcc -dumpmachine)/ && \ curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer # configure PHP -RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \ - sed -i 's/max_execution_time = 30/max_execution_time = 600/' /usr/local/etc/php/php.ini && \ +#RUN cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini && \ +# sed -i 's/max_execution_time = 30/max_execution_time = 600/' /usr/local/etc/php/php.ini && \ +# sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini + +RUN sed -i 's/max_execution_time = 30/max_execution_time = 600/' /usr/local/etc/php/php.ini && \ sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini # Copy in Firefly III source diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index a389aad123..cfc8f4e6f2 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM arm32v7/php:7.2.8-apache-stretch +FROM arm32v7/php:7.2-apache-stretch ARG ARCH COPY tmp/qemu-arm-static /usr/bin/qemu-arm-static ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1