diff --git a/.travis.yml b/.travis.yml index d833c95..bc0977d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,9 @@ env: - DOCKERFILE="7.0" - DOCKERFILE="7.0/apache" - DOCKERFILE="7.0/fpm" + - DOCKERFILE="7.1" + - DOCKERFILE="7.1/apache" + - DOCKERFILE="7.1/fpm" before_script: - docker version diff --git a/7.1/Dockerfile b/7.1/Dockerfile new file mode 100644 index 0000000..5442117 --- /dev/null +++ b/7.1/Dockerfile @@ -0,0 +1,18 @@ +FROM php:7.1-cli +MAINTAINER drupal-docker + +VOLUME /var/www/html +WORKDIR /var/www/html + +RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo git \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && pecl install redis-3.0.0 \ + && docker-php-ext-enable redis \ + && curl -sS https://getcomposer.org/installer | php \ + && mv composer.phar /usr/local/bin/composer \ + && echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile \ + && rm -rf /var/lib/apt/lists/* + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/apache/Dockerfile b/7.1/apache/Dockerfile new file mode 100644 index 0000000..c3ff656 --- /dev/null +++ b/7.1/apache/Dockerfile @@ -0,0 +1,15 @@ +FROM php:7.1-apache +MAINTAINER drupal-docker + +VOLUME /var/www/html + +RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && pecl install redis-3.0.0 \ + && docker-php-ext-enable redis \ + && a2enmod rewrite \ + && rm -rf /var/lib/apt/lists/* + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/apache/drupal-00.ini b/7.1/apache/drupal-00.ini new file mode 100644 index 0000000..9a11209 --- /dev/null +++ b/7.1/apache/drupal-00.ini @@ -0,0 +1,8 @@ +session.cache_limiter = nocache +session.auto_start = 0 +expose_php = Off +allow_url_fopen = Off +register_globals = Off +display_errors = Off +memory_limit = 512M +date.timezone = "UTC" diff --git a/7.1/apache/drupal-opcache.ini b/7.1/apache/drupal-opcache.ini new file mode 100644 index 0000000..7964455 --- /dev/null +++ b/7.1/apache/drupal-opcache.ini @@ -0,0 +1,6 @@ +opcache.memory_consumption=128 +opcache.interned_strings_buffer=8 +opcache.max_accelerated_files=4000 +opcache.revalidate_freq=60 +opcache.fast_shutdown=1 +opcache.enable_cli=1 diff --git a/7.1/drupal-00.ini b/7.1/drupal-00.ini new file mode 100644 index 0000000..d6aed40 --- /dev/null +++ b/7.1/drupal-00.ini @@ -0,0 +1,8 @@ +session.cache_limiter = nocache +session.auto_start = 0 +expose_php = Off +allow_url_fopen = On +register_globals = Off +display_errors = On +memory_limit = -1 +date.timezone = "UTC" diff --git a/7.1/drupal-opcache.ini b/7.1/drupal-opcache.ini new file mode 100644 index 0000000..7964455 --- /dev/null +++ b/7.1/drupal-opcache.ini @@ -0,0 +1,6 @@ +opcache.memory_consumption=128 +opcache.interned_strings_buffer=8 +opcache.max_accelerated_files=4000 +opcache.revalidate_freq=60 +opcache.fast_shutdown=1 +opcache.enable_cli=1 diff --git a/7.1/fpm/Dockerfile b/7.1/fpm/Dockerfile new file mode 100644 index 0000000..2bc2897 --- /dev/null +++ b/7.1/fpm/Dockerfile @@ -0,0 +1,14 @@ +FROM php:7.1-fpm +MAINTAINER drupal-docker + +VOLUME /var/www/html + +RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ + && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ + && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ + && docker-php-ext-install opcache \ + && pecl install redis-3.0.0 \ + && docker-php-ext-enable redis \ + && rm -rf /var/lib/apt/lists/* + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/fpm/drupal-00.ini b/7.1/fpm/drupal-00.ini new file mode 100644 index 0000000..9a11209 --- /dev/null +++ b/7.1/fpm/drupal-00.ini @@ -0,0 +1,8 @@ +session.cache_limiter = nocache +session.auto_start = 0 +expose_php = Off +allow_url_fopen = Off +register_globals = Off +display_errors = Off +memory_limit = 512M +date.timezone = "UTC" diff --git a/7.1/fpm/drupal-opcache.ini b/7.1/fpm/drupal-opcache.ini new file mode 100644 index 0000000..7964455 --- /dev/null +++ b/7.1/fpm/drupal-opcache.ini @@ -0,0 +1,6 @@ +opcache.memory_consumption=128 +opcache.interned_strings_buffer=8 +opcache.max_accelerated_files=4000 +opcache.revalidate_freq=60 +opcache.fast_shutdown=1 +opcache.enable_cli=1 diff --git a/README.md b/README.md index d68bb28..fb6026c 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,9 @@ Version | Type | Tags | Dockerfile 7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.0/Dockerfile) 7.0 | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.0/apache/Dockerfile) 7.0 | fpm | `7.0-fpm`, `7.fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.0/fpm/Dockerfile) +7.1 | cli | `7.1-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/Dockerfile) +7.1 | apache | `7.1-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/apache/Dockerfile) +7.1 | fpm | `7.1-fpm`, `7.1` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/fpm/Dockerfile) # Quickstart: