diff --git a/3.2-apache/Dockerfile b/3.2-apache/Dockerfile index 0ac275d..2f1fd7c 100644 --- a/3.2-apache/Dockerfile +++ b/3.2-apache/Dockerfile @@ -5,22 +5,24 @@ MAINTAINER Dmitry Seleznyov RUN apk add --no-cache curl \ imagemagick \ apache2 \ - php5-apache2 \ - php5-cli \ - php5-ctype \ - php5-opcache \ - php5-curl \ - php5-dom \ - php5-openssl \ - php5-ftp \ - php5-mysqli \ - php5-sqlite3 \ - php5-pgsql \ - php5-json \ - php5-xml \ - php5-zlib \ - php5-zip \ - php5-gd \ + php7 \ + php7-apache2 \ + php7-ctype \ + php7-curl \ + php7-dom \ + php7-ftp \ + php7-gd \ + php7-iconv \ + php7-json \ + php7-mysqli \ + php7-opcache \ + php7-openssl \ + php7-pgsql \ + php7-sqlite3 \ + php7-tokenizer \ + php7-xml \ + php7-zlib \ + php7-zip \ su-exec ### phpBB @@ -40,17 +42,15 @@ RUN curl -SL https://www.phpbb.com/files/release/phpBB-${PHPBB_VERSION}.tar.bz2 COPY phpbb/config.php /phpbb/www ### Server -RUN mkdir -p /run/apache2 \ - && chown apache:apache /run/apache2 +RUN mkdir -p /run/apache2 /phpbb/opcache \ + && chown apache:apache /run/apache2 /phpbb/opcache COPY apache2/httpd.conf /etc/apache2/ COPY apache2/conf.d/* /etc/apache2/conf.d/ -COPY php5/php.ini /etc/php5/ -COPY php5/php-cli.ini /etc/php5/ -COPY php5/conf.d/* /etc/php5/conf.d/ -# Alpine 3.6 doesn't create this symlink for PHP5 in favour of PHP7 -RUN ln -s /usr/bin/php5 /usr/bin/php +COPY php/php.ini /etc/php7/ +COPY php/php-cli.ini /etc/php7/ +COPY php/conf.d/* /etc/php7/conf.d/ COPY start.sh /usr/local/bin/ diff --git a/3.2-apache/php5/conf.d/opcache-recomended.ini b/3.2-apache/php/conf.d/opcache.ini similarity index 83% rename from 3.2-apache/php5/conf.d/opcache-recomended.ini rename to 3.2-apache/php/conf.d/opcache.ini index 7964455..ed4e7d3 100644 --- a/3.2-apache/php5/conf.d/opcache-recomended.ini +++ b/3.2-apache/php/conf.d/opcache.ini @@ -4,3 +4,4 @@ opcache.max_accelerated_files=4000 opcache.revalidate_freq=60 opcache.fast_shutdown=1 opcache.enable_cli=1 +opcache.file_cache=/phpbb/opcache \ No newline at end of file diff --git a/3.2-apache/php5/php-cli.ini b/3.2-apache/php/php-cli.ini similarity index 100% rename from 3.2-apache/php5/php-cli.ini rename to 3.2-apache/php/php-cli.ini diff --git a/3.2-apache/php5/php.ini b/3.2-apache/php/php.ini similarity index 100% rename from 3.2-apache/php5/php.ini rename to 3.2-apache/php/php.ini