From 4cd824f3b762596e99004eaa3475248564d5eeb9 Mon Sep 17 00:00:00 2001 From: James Cole Date: Fri, 1 Nov 2019 06:03:08 +0100 Subject: [PATCH] Fix Docker files. --- Dockerfile.amd64 | 31 +----------------------------- Dockerfile.arm64 | 50 ++++++++++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 51 deletions(-) diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 99c593b670..15d23bb68f 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -1,33 +1,4 @@ -FROM arm64v8/php:7.3-apache-stretch -ENV COMPOSER_ALLOW_SUPERUSER=1 - -# Install stuff Firefly III runs with & depends on: php extensions, locales, dev headers and composer -RUN apt-get update && apt-get install -y locales unzip && apt-get clean && rm -rf /var/lib/apt/lists/* - -# Script to run common extensions -ADD https://raw.githubusercontent.com/mlocati/docker-php-extension-installer/master/install-php-extensions /usr/local/bin/ - -RUN chmod uga+x /usr/local/bin/install-php-extensions && sync && \ - install-php-extensions --cleanup bcmath ldap gd pdo_pgsql pdo_sqlite pdo_mysql intl opcache memcached - -# common config -RUN a2enmod rewrite && a2enmod ssl && \ - echo "el_GR.UTF-8 UTF-8\nhu_HU.UTF-8 UTF-8\nro_RO.UTF-8 UTF-8\nnb_NO.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\ncs_CZ.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 && \ - composer global require hirak/prestissimo --no-plugins --no-scripts && \ - 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 ca certs to correct location -COPY ./cacert.pem /usr/local/ssl/cert.pem - -# copy Apache config to correct spot. -COPY ./apache2.conf /etc/apache2/apache2.conf - -# Enable default site (Firefly III) -COPY ./apache-firefly-iii.conf /etc/apache2/sites-available/000-default.conf +FROM jc5x/firefly-iii-base-image:latest # See also: https://github.com/JC5/firefly-iii-base-image diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 55202f7e3a..99c593b670 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,24 +1,41 @@ -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 -LABEL version="1.5" maintainer="thegrumpydictator@gmail.com" - -# Create volumes -VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload +FROM arm64v8/php:7.3-apache-stretch +ENV COMPOSER_ALLOW_SUPERUSER=1 # Install stuff Firefly III runs with & depends on: php extensions, locales, dev headers and composer RUN apt-get update && apt-get install -y locales unzip && apt-get clean && rm -rf /var/lib/apt/lists/* +# Script to run common extensions ADD https://raw.githubusercontent.com/mlocati/docker-php-extension-installer/master/install-php-extensions /usr/local/bin/ RUN chmod uga+x /usr/local/bin/install-php-extensions && sync && \ install-php-extensions --cleanup bcmath ldap gd pdo_pgsql pdo_sqlite pdo_mysql intl opcache memcached -RUN a2enmod rewrite && a2enmod ssl -RUN echo "hu_HU.UTF-8 UTF-8\nro_RO.UTF-8 UTF-8\nnb_NO.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\ncs_CZ.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 -RUN locale-gen -RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer +# common config +RUN a2enmod rewrite && a2enmod ssl && \ + echo "el_GR.UTF-8 UTF-8\nhu_HU.UTF-8 UTF-8\nro_RO.UTF-8 UTF-8\nnb_NO.UTF-8 UTF-8\nde_DE.UTF-8 UTF-8\ncs_CZ.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 && \ + composer global require hirak/prestissimo --no-plugins --no-scripts && \ + 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 ca certs to correct location +COPY ./cacert.pem /usr/local/ssl/cert.pem + +# copy Apache config to correct spot. +COPY ./apache2.conf /etc/apache2/apache2.conf + +# Enable default site (Firefly III) +COPY ./apache-firefly-iii.conf /etc/apache2/sites-available/000-default.conf + +# See also: https://github.com/JC5/firefly-iii-base-image + +ENV FIREFLY_PATH=/var/www/firefly-iii COMPOSER_ALLOW_SUPERUSER=1 +LABEL version="1.5" maintainer="thegrumpydictator@gmail.com" + +# Create volumes +VOLUME $FIREFLY_PATH/storage/export $FIREFLY_PATH/storage/upload # Copy in Firefly III source WORKDIR $FIREFLY_PATH @@ -29,15 +46,6 @@ 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 - -# copy Apache config to correct spot. -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 - # Expose port 80 EXPOSE 80