From cc67445f3558d0bc3870a4a43cdf08dc17f4c30c Mon Sep 17 00:00:00 2001 From: James Cole Date: Sun, 24 Mar 2019 14:54:46 +0100 Subject: [PATCH] Update Docker files slightly (yes I am a nitpicker). --- Dockerfile | 2 +- Dockerfile.amd64 | 2 +- Dockerfile.arm | 2 +- Dockerfile.arm64 | 38 +++++++++++++++++++++++--------------- 4 files changed, 26 insertions(+), 18 deletions(-) diff --git a/Dockerfile b/Dockerfile index 172835a6df..f899f1ff6d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ LABEL version="1.4" maintainer="thegrumpydictator@gmail.com" # Create volumes VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload -# Install stuffs Firefly run & depends on: php extensions, locales, dev headers and composer +# Install stuff Firefly III runs with & depends on: php extensions, locales, dev headers and composer RUN apt-get update && apt-get install -y libpng-dev \ libicu-dev \ unzip \ diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 3f19692a28..e4779c71d3 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -6,7 +6,7 @@ LABEL version="1.4" maintainer="thegrumpydictator@gmail.com" # Create volumes VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload -# Install stuffs Firefly run & depends on: php extensions, locales, dev headers and composer +# Install stuff Firefly III runs with & depends on: php extensions, locales, dev headers and composer RUN apt-get update && apt-get install -y libpng-dev \ libicu-dev \ unzip \ diff --git a/Dockerfile.arm b/Dockerfile.arm index ee1a21dc01..9cf035d755 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -7,7 +7,7 @@ LABEL version="1.4" maintainer="thegrumpydictator@gmail.com" # Create volumes VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload -# Install stuffs Firefly run & depends on: php extensions, locales, dev headers and composer +# Install stuff Firefly III runs with & depends on: php extensions, locales, dev headers and composer RUN apt-get update && apt-get install -y libpng-dev \ libicu-dev \ unzip \ diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 536ef42cdc..9cf035d755 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -7,7 +7,7 @@ LABEL version="1.4" maintainer="thegrumpydictator@gmail.com" # Create volumes VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload -# Install some stuff +# Install stuff Firefly III runs with & depends on: php extensions, locales, dev headers and composer RUN apt-get update && apt-get install -y libpng-dev \ libicu-dev \ unzip \ @@ -15,12 +15,33 @@ RUN apt-get update && apt-get install -y libpng-dev \ libldap2-dev \ libpq-dev \ locales \ - libmemcached-dev + libmemcached-dev && \ + apt-get clean && \ + rm -rf /var/lib/apt/lists/* + +RUN docker-php-ext-configure ldap --with-libdir=lib/$(gcc -dumpmachine)/ && \ + docker-php-ext-install -j$(nproc) zip bcmath ldap gd pdo_pgsql pdo_mysql intl opcache && \ + pecl install memcached-3.1.3 && \ + docker-php-ext-enable memcached && \ + a2enmod rewrite && a2enmod ssl && \ + echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n\n" > /etc/locale.gen && \ + locale-gen && \ + 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 && \ + sed -i 's/memory_limit = 128M/memory_limit = 512M/' /usr/local/etc/php/php.ini # Copy in Firefly III source WORKDIR $FIREFLY_PATH ADD . $FIREFLY_PATH +# Ensure correct app directory permission, then `composer install` +RUN chown -R www-data:www-data /var/www && \ + chmod -R 775 $FIREFLY_PATH/storage && \ + composer install --prefer-dist --no-dev --no-scripts --no-suggest + # copy ca certs to correct location COPY ./.deploy/docker/cacert.pem /usr/local/ssl/cert.pem @@ -30,19 +51,6 @@ COPY ./.deploy/docker/apache2.conf /etc/apache2/apache2.conf # Enable default site (Firefly III) COPY ./.deploy/docker/apache-firefly.conf /etc/apache2/sites-available/000-default.conf -# Run a lot of installation commands: -RUN chown -R www-data:www-data /var/www && \ - chmod -R 775 $FIREFLY_PATH/storage && \ - a2enmod rewrite && a2enmod ssl && \ - docker-php-ext-configure ldap --with-libdir=lib/$(gcc -dumpmachine)/ && \ - docker-php-ext-install -j$(nproc) zip bcmath ldap gd pdo_pgsql pdo_mysql intl opcache && \ - pecl install memcached-3.1.3 && \ - docker-php-ext-enable memcached && \ - curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer && \ - echo "de_DE.UTF-8 UTF-8\nen_US.UTF-8 UTF-8\nes_ES.UTF-8 UTF-8\nfr_FR.UTF-8 UTF-8\nid_ID.UTF-8 UTF-8\nit_IT.UTF-8 UTF-8\nnl_NL.UTF-8 UTF-8\npl_PL.UTF-8 UTF-8\npt_BR.UTF-8 UTF-8\nru_RU.UTF-8 UTF-8\ntr_TR.UTF-8 UTF-8\nzh_TW.UTF-8 UTF-8\nzh_CN.UTF-8 UTF-8\n\n" > /etc/locale.gen && \ - locale-gen && \ - composer install --prefer-dist --no-dev --no-scripts --no-suggest - # Expose port 80 EXPOSE 80