diff --git a/build-scripts/drupal7/Dockerfile b/build-scripts/drupal7/Dockerfile index aeb62e3d61b274fd30751b66b3e4a99ec4b05842..dbae2f6bb2ecdd56e4c26b1a5651bc9636f5f219 100644 --- a/build-scripts/drupal7/Dockerfile +++ b/build-scripts/drupal7/Dockerfile @@ -49,7 +49,7 @@ RUN apt-get install -y \ php7.1-mcrypt \ php7.1-zip \ php-pear \ - libapache2-mod-php5.6 \ + libapache2-mod-php7.1 \ optipng \ pdftk \ jpegoptim \ @@ -111,15 +111,15 @@ RUN a2enconf php5.6-fpm RUN service php5.6-fpm restart ## Make sure we are running php5.6 -RUN update-alternatives --set php /usr/bin/php5.6 -RUN a2enmod php5.6 +RUN update-alternatives --set php /usr/bin/php7.1 +RUN a2enmod php7.1 RUN service apache2 restart ## Check version of PHP RUN php -v ## Install Drupal. -RUN drush dl -v -d drupal-7.60 --destination="/var/www" --drupal-project-rename="drupal7" +RUN drush dl -v -d drupal-7.61 --destination="/var/www" --drupal-project-rename="drupal7" RUN chown -R www-data:www-data /var/www/ @@ -188,18 +188,18 @@ COPY docker-entrypoint-d7.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/docker-entrypoint-d7.sh ## Add Drupal specific changes for PHP to the php.ini files. -RUN sed -i "s/display_errors = .*/display_errors = On/" /etc/php/5.6/apache2/php.ini && \ - sed -i "s/display_errors = .*/display_errors = On/" /etc/php/5.6/fpm/php.ini && \ - sed -i "s/display_errors = .*/display_errors = On/" /etc/php/5.6/cli/php.ini && \ - sed -i "s/max_execution_time =.*/max_execution_time = 240/" /etc/php/5.6/apache2/php.ini && \ - sed -i "s/max_execution_time =.*/max_execution_time = 240/" /etc/php/5.6/cli/php.ini && \ - sed -i "s/max_input_time = .*/max_input_time = 240/" /etc/php/5.6/apache2/php.ini && \ - sed -i "s/max_input_time = .*/max_input_time = 240/" /etc/php/5.6/cli/php.ini && \ - sed -i "s/memory_limit = .*/memory_limit = 768M/" /etc/php/5.6/apache2/php.ini && \ - sed -i "s/memory_limit = .*/memory_limit = 768M/" /etc/php/5.6/cli/php.ini && \ - sed -i "s/; max_input_vars = .*/max_input_vars = 10000/" /etc/php/5.6/apache2/php.ini && \ - sed -i "s/;date.timezone = */date.timezone = America\/Toronto/" /etc/php/5.6/apache2/php.ini && \ - sed -i "s/;date.timezone = */date.timezone = America\/Toronto/" /etc/php/5.6/cli/php.ini +RUN sed -i "s/display_errors = .*/display_errors = On/" /etc/php/7.1/apache2/php.ini && \ + sed -i "s/display_errors = .*/display_errors = On/" /etc/php/7.1/fpm/php.ini && \ + sed -i "s/display_errors = .*/display_errors = On/" /etc/php/7.1/cli/php.ini && \ + sed -i "s/max_execution_time =.*/max_execution_time = 240/" /etc/php/7.1/apache2/php.ini && \ + sed -i "s/max_execution_time =.*/max_execution_time = 240/" /etc/php/7.1/cli/php.ini && \ + sed -i "s/max_input_time = .*/max_input_time = 240/" /etc/php/7.1/apache2/php.ini && \ + sed -i "s/max_input_time = .*/max_input_time = 240/" /etc/php/7.1/cli/php.ini && \ + sed -i "s/memory_limit = .*/memory_limit = 768M/" /etc/php/7.1/apache2/php.ini && \ + sed -i "s/memory_limit = .*/memory_limit = 768M/" /etc/php/7.1/cli/php.ini && \ + sed -i "s/; max_input_vars = .*/max_input_vars = 10000/" /etc/php/7.1/apache2/php.ini && \ + sed -i "s/;date.timezone = */date.timezone = America\/Toronto/" /etc/php/7.1/apache2/php.ini && \ + sed -i "s/;date.timezone = */date.timezone = America\/Toronto/" /etc/php/7.1/cli/php.ini # Expose the default Apache port. EXPOSE 80