From f2a2025404b488a3fc30a17f4feee1367f5712b7 Mon Sep 17 00:00:00 2001 From: Janez Urevc Date: Wed, 8 Jun 2016 19:49:01 +0200 Subject: [PATCH 01/34] Prepare dev images to live in a separate branch. --- 5.4/Dockerfile | 18 ++++-------------- 5.4/apache/Dockerfile | 15 ++++----------- 5.4/apache/drupal.ini | 7 ------- 5.4/apache/xdebug.ini | 8 ++++++++ 5.4/drupal.ini | 7 ------- 5.4/fpm/Dockerfile | 14 ++++---------- 5.4/fpm/drupal.ini | 7 ------- 5.4/fpm/xdebug.ini | 8 ++++++++ 5.4/xdebug.ini | 8 ++++++++ 5.5/Dockerfile | 19 ++++--------------- 5.5/apache/Dockerfile | 16 ++++------------ 5.5/apache/drupal.ini | 7 ------- 5.5/apache/opcache-recommended.ini | 6 ------ 5.5/apache/xdebug.ini | 8 ++++++++ 5.5/drupal.ini | 7 ------- 5.5/fpm/Dockerfile | 15 ++++----------- 5.5/fpm/drupal.ini | 7 ------- 5.5/fpm/opcache-recommended.ini | 6 ------ 5.5/fpm/xdebug.ini | 8 ++++++++ 5.5/opcache-recommended.ini | 6 ------ 5.5/xdebug.ini | 8 ++++++++ 5.6/Dockerfile | 19 ++++--------------- 5.6/apache/Dockerfile | 16 ++++------------ 5.6/apache/drupal.ini | 8 -------- 5.6/apache/opcache-recommended.ini | 6 ------ 5.6/apache/xdebug.ini | 8 ++++++++ 5.6/drupal.ini | 8 -------- 5.6/fpm/Dockerfile | 15 ++++----------- 5.6/fpm/drupal.ini | 8 -------- 5.6/fpm/opcache-recommended.ini | 6 ------ 5.6/fpm/xdebug.ini | 8 ++++++++ 5.6/opcache-recommended.ini | 6 ------ 5.6/xdebug.ini | 8 ++++++++ 7.0/Dockerfile | 22 ++++------------------ 7.0/apache/Dockerfile | 19 ++++--------------- 7.0/apache/drupal.ini | 7 ------- 7.0/apache/opcache-recommended.ini | 6 ------ 7.0/apache/xdebug.ini | 8 ++++++++ 7.0/drupal.ini | 7 ------- 7.0/fpm/Dockerfile | 19 ++++--------------- 7.0/fpm/drupal.ini | 7 ------- 7.0/fpm/opcache-recommended.ini | 6 ------ 7.0/fpm/xdebug.ini | 8 ++++++++ 7.0/opcache-recommended.ini | 6 ------ 7.0/xdebug.ini | 8 ++++++++ 45 files changed, 144 insertions(+), 300 deletions(-) delete mode 100644 5.4/apache/drupal.ini create mode 100644 5.4/apache/xdebug.ini delete mode 100644 5.4/drupal.ini delete mode 100644 5.4/fpm/drupal.ini create mode 100644 5.4/fpm/xdebug.ini create mode 100644 5.4/xdebug.ini delete mode 100644 5.5/apache/drupal.ini delete mode 100644 5.5/apache/opcache-recommended.ini create mode 100644 5.5/apache/xdebug.ini delete mode 100644 5.5/drupal.ini delete mode 100644 5.5/fpm/drupal.ini delete mode 100644 5.5/fpm/opcache-recommended.ini create mode 100644 5.5/fpm/xdebug.ini delete mode 100644 5.5/opcache-recommended.ini create mode 100644 5.5/xdebug.ini delete mode 100644 5.6/apache/drupal.ini delete mode 100644 5.6/apache/opcache-recommended.ini create mode 100644 5.6/apache/xdebug.ini delete mode 100644 5.6/drupal.ini delete mode 100644 5.6/fpm/drupal.ini delete mode 100644 5.6/fpm/opcache-recommended.ini create mode 100644 5.6/fpm/xdebug.ini delete mode 100644 5.6/opcache-recommended.ini create mode 100644 5.6/xdebug.ini delete mode 100644 7.0/apache/drupal.ini delete mode 100644 7.0/apache/opcache-recommended.ini create mode 100644 7.0/apache/xdebug.ini delete mode 100644 7.0/drupal.ini delete mode 100644 7.0/fpm/drupal.ini delete mode 100644 7.0/fpm/opcache-recommended.ini create mode 100644 7.0/fpm/xdebug.ini delete mode 100644 7.0/opcache-recommended.ini create mode 100644 7.0/xdebug.ini diff --git a/5.4/Dockerfile b/5.4/Dockerfile index be22b6c..80f968d 100644 --- a/5.4/Dockerfile +++ b/5.4/Dockerfile @@ -1,17 +1,7 @@ -FROM php:5.4-cli +FROM drupaldocker/php:5.4-cli MAINTAINER drupal-docker -VOLUME /var/www/html -WORKDIR /var/www/html +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo \ - && 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 \ - && pecl install redis \ - && 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/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile index f8eacd9..7ec7775 100644 --- a/5.4/apache/Dockerfile +++ b/5.4/apache/Dockerfile @@ -1,14 +1,7 @@ -FROM php:5.4-apache +FROM drupaldocker/php:5.4-apache MAINTAINER drupal-docker -VOLUME /var/www/html +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -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 \ - && pecl install redis \ - && docker-php-ext-enable redis \ - && a2enmod rewrite \ - && rm -rf /var/lib/apt/lists/* - -COPY drupal.ini /usr/local/etc/php/conf.d/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/apache/drupal.ini b/5.4/apache/drupal.ini deleted file mode 100644 index 09af805..0000000 --- a/5.4/apache/drupal.ini +++ /dev/null @@ -1,7 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = Off -register_globals = Off -display_errors = Off -memory_limit = 512M diff --git a/5.4/apache/xdebug.ini b/5.4/apache/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/5.4/apache/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/5.4/drupal.ini b/5.4/drupal.ini deleted file mode 100644 index f910fb3..0000000 --- a/5.4/drupal.ini +++ /dev/null @@ -1,7 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = On -register_globals = Off -display_errors = On -memory_limit = -1 diff --git a/5.4/fpm/Dockerfile b/5.4/fpm/Dockerfile index 7f1ae2b..b5181cc 100644 --- a/5.4/fpm/Dockerfile +++ b/5.4/fpm/Dockerfile @@ -1,13 +1,7 @@ -FROM php:5.4-fpm +FROM drupaldocker/php:5.4-fpm MAINTAINER drupal-docker -VOLUME /var/www/html +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -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 \ - && pecl install redis \ - && docker-php-ext-enable redis \ - && rm -rf /var/lib/apt/lists/* - -COPY drupal.ini /usr/local/etc/php/conf.d/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/fpm/drupal.ini b/5.4/fpm/drupal.ini deleted file mode 100644 index 09af805..0000000 --- a/5.4/fpm/drupal.ini +++ /dev/null @@ -1,7 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = Off -register_globals = Off -display_errors = Off -memory_limit = 512M diff --git a/5.4/fpm/xdebug.ini b/5.4/fpm/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/5.4/fpm/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/5.4/xdebug.ini b/5.4/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/5.4/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/5.5/Dockerfile b/5.5/Dockerfile index 51e52a8..b69d7e7 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -1,18 +1,7 @@ -FROM php:5.5-cli +FROM drupaldocker/php:5.5-cli MAINTAINER drupal-docker -VOLUME /var/www/html -WORKDIR /var/www/html +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo \ - && 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 \ - && 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 opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index 0ae8e00..0820531 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -1,15 +1,7 @@ -FROM php:5.5-apache +FROM drupaldocker/php:5.5-apache MAINTAINER drupal-docker -VOLUME /var/www/html +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -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 \ - && docker-php-ext-enable redis \ - && a2enmod rewrite \ - && rm -rf /var/lib/apt/lists/* - -COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/apache/drupal.ini b/5.5/apache/drupal.ini deleted file mode 100644 index 09af805..0000000 --- a/5.5/apache/drupal.ini +++ /dev/null @@ -1,7 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = Off -register_globals = Off -display_errors = Off -memory_limit = 512M diff --git a/5.5/apache/opcache-recommended.ini b/5.5/apache/opcache-recommended.ini deleted file mode 100644 index 7964455..0000000 --- a/5.5/apache/opcache-recommended.ini +++ /dev/null @@ -1,6 +0,0 @@ -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/5.5/apache/xdebug.ini b/5.5/apache/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/5.5/apache/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/5.5/drupal.ini b/5.5/drupal.ini deleted file mode 100644 index f910fb3..0000000 --- a/5.5/drupal.ini +++ /dev/null @@ -1,7 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = On -register_globals = Off -display_errors = On -memory_limit = -1 diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile index 5fc8808..5ab0336 100644 --- a/5.5/fpm/Dockerfile +++ b/5.5/fpm/Dockerfile @@ -1,14 +1,7 @@ -FROM php:5.5-fpm +FROM drupaldocker/php:5.5-fpm MAINTAINER drupal-docker -VOLUME /var/www/html +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -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 \ - && docker-php-ext-enable redis \ - && rm -rf /var/lib/apt/lists/* - -COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/fpm/drupal.ini b/5.5/fpm/drupal.ini deleted file mode 100644 index 09af805..0000000 --- a/5.5/fpm/drupal.ini +++ /dev/null @@ -1,7 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = Off -register_globals = Off -display_errors = Off -memory_limit = 512M diff --git a/5.5/fpm/opcache-recommended.ini b/5.5/fpm/opcache-recommended.ini deleted file mode 100644 index 7964455..0000000 --- a/5.5/fpm/opcache-recommended.ini +++ /dev/null @@ -1,6 +0,0 @@ -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/5.5/fpm/xdebug.ini b/5.5/fpm/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/5.5/fpm/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/5.5/opcache-recommended.ini b/5.5/opcache-recommended.ini deleted file mode 100644 index 7964455..0000000 --- a/5.5/opcache-recommended.ini +++ /dev/null @@ -1,6 +0,0 @@ -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/5.5/xdebug.ini b/5.5/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/5.5/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 78c06c3..81375b6 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -1,18 +1,7 @@ -FROM php:5.6-cli +FROM drupaldocker/php:5.6-cli MAINTAINER drupal-docker -VOLUME /var/www/html -WORKDIR /var/www/html +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo \ - && 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 \ - && 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 opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index 1ba2537..9cbd1a9 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -1,15 +1,7 @@ -FROM php:5.6-apache +FROM drupaldocker/php:5.6-apache MAINTAINER drupal-docker -VOLUME /var/www/html +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -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 \ - && docker-php-ext-enable redis \ - && a2enmod rewrite \ - && rm -rf /var/lib/apt/lists/* - -COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/apache/drupal.ini b/5.6/apache/drupal.ini deleted file mode 100644 index cc43206..0000000 --- a/5.6/apache/drupal.ini +++ /dev/null @@ -1,8 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = Off -register_globals = Off -display_errors = Off -memory_limit = 512M -always_populate_raw_post_data = -1 diff --git a/5.6/apache/opcache-recommended.ini b/5.6/apache/opcache-recommended.ini deleted file mode 100644 index 7964455..0000000 --- a/5.6/apache/opcache-recommended.ini +++ /dev/null @@ -1,6 +0,0 @@ -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/5.6/apache/xdebug.ini b/5.6/apache/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/5.6/apache/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/5.6/drupal.ini b/5.6/drupal.ini deleted file mode 100644 index 4c2feae..0000000 --- a/5.6/drupal.ini +++ /dev/null @@ -1,8 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = On -register_globals = Off -display_errors = On -memory_limit = -1 -always_populate_raw_post_data = -1 diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index 3fbfb67..af398e7 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -1,14 +1,7 @@ -FROM php:5.6-fpm +FROM drupaldocker/php:5.6-fpm MAINTAINER drupal-docker -VOLUME /var/www/html +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -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 \ - && docker-php-ext-enable redis \ - && rm -rf /var/lib/apt/lists/* - -COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/fpm/drupal.ini b/5.6/fpm/drupal.ini deleted file mode 100644 index cc43206..0000000 --- a/5.6/fpm/drupal.ini +++ /dev/null @@ -1,8 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = Off -register_globals = Off -display_errors = Off -memory_limit = 512M -always_populate_raw_post_data = -1 diff --git a/5.6/fpm/opcache-recommended.ini b/5.6/fpm/opcache-recommended.ini deleted file mode 100644 index 7964455..0000000 --- a/5.6/fpm/opcache-recommended.ini +++ /dev/null @@ -1,6 +0,0 @@ -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/5.6/fpm/xdebug.ini b/5.6/fpm/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/5.6/fpm/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/5.6/opcache-recommended.ini b/5.6/opcache-recommended.ini deleted file mode 100644 index 7964455..0000000 --- a/5.6/opcache-recommended.ini +++ /dev/null @@ -1,6 +0,0 @@ -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/5.6/xdebug.ini b/5.6/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/5.6/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/7.0/Dockerfile b/7.0/Dockerfile index 2e9dc73..93ccb53 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -1,21 +1,7 @@ -FROM php:7.0-cli +FROM drupaldocker/php:7.0-cli MAINTAINER drupal-docker -VOLUME /var/www/html -WORKDIR /var/www/html +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -ADD https://github.com/phpredis/phpredis/archive/php7.zip /tmp/php7.zip -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo unzip \ - && unzip /tmp/php7.zip -d /usr/src/php/ext \ - && mv /usr/src/php/ext/phpredis-php7 /usr/src/php/ext/redis \ - && 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 redis \ - && docker-php-ext-install opcache \ - && curl -sS https://getcomposer.org/installer | php \ - && mv composer.phar /usr/local/bin/composer \ - && echo "export PATH=~/.composer/vendor/bin:\$PATH" >> ~/.bash_profile \ - && rm -fr /tmp/php7.zip \ - && apt-get -y purge unzip \ - && rm -rf /var/lib/apt/lists/* - -COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index 6c28098..4f70d58 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -1,18 +1,7 @@ -FROM php:7.0-apache +FROM drupaldocker/php:7.0-apache MAINTAINER drupal-docker -VOLUME /var/www/html +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -ADD https://github.com/phpredis/phpredis/archive/php7.zip /tmp/php7.zip -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev unzip \ - && unzip /tmp/php7.zip -d /usr/src/php/ext \ - && mv /usr/src/php/ext/phpredis-php7 /usr/src/php/ext/redis \ - && 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 redis \ - && docker-php-ext-install opcache \ - && rm -fr /tmp/php7.zip \ - && apt-get -y purge unzip \ - && a2enmod rewrite \ - && rm -rf /var/lib/apt/lists/* - -COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/apache/drupal.ini b/7.0/apache/drupal.ini deleted file mode 100644 index 09af805..0000000 --- a/7.0/apache/drupal.ini +++ /dev/null @@ -1,7 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = Off -register_globals = Off -display_errors = Off -memory_limit = 512M diff --git a/7.0/apache/opcache-recommended.ini b/7.0/apache/opcache-recommended.ini deleted file mode 100644 index 7964455..0000000 --- a/7.0/apache/opcache-recommended.ini +++ /dev/null @@ -1,6 +0,0 @@ -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.0/apache/xdebug.ini b/7.0/apache/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/7.0/apache/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/7.0/drupal.ini b/7.0/drupal.ini deleted file mode 100644 index f910fb3..0000000 --- a/7.0/drupal.ini +++ /dev/null @@ -1,7 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = On -register_globals = Off -display_errors = On -memory_limit = -1 diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index 0200013..2a6961d 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -1,18 +1,7 @@ - -FROM php:7.0-fpm +FROM drupaldocker/php:7.0-fpm MAINTAINER drupal-docker -VOLUME /var/www/html - -ADD https://github.com/phpredis/phpredis/archive/php7.zip /tmp/php7.zip -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev unzip \ - && unzip /tmp/php7.zip -d /usr/src/php/ext \ - && mv /usr/src/php/ext/phpredis-php7 /usr/src/php/ext/redis \ - && 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 redis \ - && docker-php-ext-install opcache \ - && rm -fr /tmp/php7.zip \ - && apt-get -y purge unzip \ - && rm -rf /var/lib/apt/lists/* +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug -COPY opcache-recommended.ini drupal.ini /usr/local/etc/php/conf.d/ +COPY xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/fpm/drupal.ini b/7.0/fpm/drupal.ini deleted file mode 100644 index 09af805..0000000 --- a/7.0/fpm/drupal.ini +++ /dev/null @@ -1,7 +0,0 @@ -session.cache_limiter = nocache -session.auto_start = 0 -expose_php = Off -allow_url_fopen = Off -register_globals = Off -display_errors = Off -memory_limit = 512M diff --git a/7.0/fpm/opcache-recommended.ini b/7.0/fpm/opcache-recommended.ini deleted file mode 100644 index 7964455..0000000 --- a/7.0/fpm/opcache-recommended.ini +++ /dev/null @@ -1,6 +0,0 @@ -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.0/fpm/xdebug.ini b/7.0/fpm/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/7.0/fpm/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/7.0/opcache-recommended.ini b/7.0/opcache-recommended.ini deleted file mode 100644 index 7964455..0000000 --- a/7.0/opcache-recommended.ini +++ /dev/null @@ -1,6 +0,0 @@ -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.0/xdebug.ini b/7.0/xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/7.0/xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 From e3a237a9339d3464611ec77f5c913b5734777a7d Mon Sep 17 00:00:00 2001 From: zaporylie Date: Wed, 8 Jun 2016 20:09:02 +0200 Subject: [PATCH 02/34] Update Readme --- README.md | 58 +++++++++++++++++++------------------------------------ 1 file changed, 20 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index d68bb28..f7d75ee 100644 --- a/README.md +++ b/README.md @@ -1,52 +1,34 @@ -PHP for Drupal +PHP-dev for Drupal ===================== -[![Build Status](https://travis-ci.org/drupal-docker/php.svg?branch=master)](https://travis-ci.org/drupal-docker/php) -[![Docker Pulls](https://img.shields.io/docker/pulls/drupaldocker/php.svg?maxAge=2592000)](https://hub.docker.com/r/drupaldocker/php) +[![Build Status](https://travis-ci.org/drupal-docker/php.svg?branch=dev)](https://travis-ci.org/drupal-docker/php) +[![Docker Pulls](https://img.shields.io/docker/pulls/drupaldocker/php-dev.svg?maxAge=2592000)](https://hub.docker.com/r/drupaldocker/php-dev) Version | Type | Tags | Dockerfile --- | --- | --- | --- -5.4 | cli | `5.4-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.4/Dockerfile) -5.4 | apache | `5.4-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.4/apache/Dockerfile) -5.4 | fpm | `5.4-fpm`, `5.4` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.4/fpm/Dockerfile) -5.5 | cli | `5.5-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.5/Dockerfile) -5.5 | apache | `5.5-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.5/apache/Dockerfile) -5.5 | fpm | `5.5-fpm`, `5.5` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.5/fpm/Dockerfile) -5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/Dockerfile) -5.6 | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/apache/Dockerfile) -5.6 | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/fpm/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) +5.4 | cli | `5.4-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/Dockerfile) +5.4 | apache | `5.4-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/apache/Dockerfile) +5.4 | fpm | `5.4-fpm`, `5.4` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/fpm/Dockerfile) +5.5 | cli | `5.5-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/Dockerfile) +5.5 | apache | `5.5-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/apache/Dockerfile) +5.5 | fpm | `5.5-fpm`, `5.5` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/fpm/Dockerfile) +5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile) +5.6 | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/apache/Dockerfile) +5.6 | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/fpm/Dockerfile) +7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile) +7.0 | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/apache/Dockerfile) +7.0 | fpm | `7.0-fpm`, `7.fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/fpm/Dockerfile) # Quickstart: PHP 5.6 + Apache ```bash -docker run -dP drupaldocker/php:apache +docker run -dP drupaldocker/php-dev:apache ``` -# Environmental variables +# Features -No variables +- xdebug -# Description +# More -> PHP is a server-side scripting language designed for web development, but which can also be used as a general-purpose programming language. PHP can be added to straight HTML or it can be used with a variety of templating engines and web frameworks. PHP code is usually processed by an interpreter, which is either implemented as a native module on the web-server or as a common gateway interface (CGI). - -> source: [php](https://hub.docker.com/_/php/) - -# Status - -Proof of concept - -# Contributing - -1. Fork the repo -1. Create your feature branch -1. Commit your changes -1. Push to the branch -1. Create new Pull Request -1. Wait for result of automate tests - -# Credits -`drupaldocker/php images were built on the top of official [PHP images](https://hub.docker.com/r/_/php/). Big kudos to people from Docker community for official [Drupal image](https://hub.docker.com/r/_/drupal/). +Read more about PHP image in [master README](https://github.com/drupal-docker/php/blob/master/README.md). From 99f58fd6ce44ef03b5c37f23898f87fa550f7a43 Mon Sep 17 00:00:00 2001 From: zaporylie Date: Thu, 23 Jun 2016 17:40:42 +0200 Subject: [PATCH 03/34] Issue #43: common prefix for .ini files - dev branch --- 5.4/Dockerfile | 2 +- 5.4/apache/Dockerfile | 2 +- 5.4/apache/{xdebug.ini => drupal-xdebug.ini} | 0 5.4/{fpm/xdebug.ini => drupal-xdebug.ini} | 0 5.4/fpm/Dockerfile | 2 +- 5.4/{xdebug.ini => fpm/drupal-xdebug.ini} | 0 5.5/Dockerfile | 2 +- 5.5/apache/Dockerfile | 2 +- 5.5/apache/{xdebug.ini => drupal-xdebug.ini} | 0 5.5/{fpm/xdebug.ini => drupal-xdebug.ini} | 0 5.5/fpm/Dockerfile | 2 +- 5.5/{xdebug.ini => fpm/drupal-xdebug.ini} | 0 5.6/Dockerfile | 2 +- 5.6/apache/Dockerfile | 2 +- 5.6/apache/{xdebug.ini => drupal-xdebug.ini} | 0 5.6/{fpm/xdebug.ini => drupal-xdebug.ini} | 0 5.6/fpm/Dockerfile | 2 +- 5.6/{xdebug.ini => fpm/drupal-xdebug.ini} | 0 7.0/Dockerfile | 2 +- 7.0/apache/Dockerfile | 2 +- 7.0/apache/{xdebug.ini => drupal-xdebug.ini} | 0 7.0/{fpm/xdebug.ini => drupal-xdebug.ini} | 0 7.0/fpm/Dockerfile | 2 +- 7.0/{xdebug.ini => fpm/drupal-xdebug.ini} | 0 24 files changed, 12 insertions(+), 12 deletions(-) rename 5.4/apache/{xdebug.ini => drupal-xdebug.ini} (100%) rename 5.4/{fpm/xdebug.ini => drupal-xdebug.ini} (100%) rename 5.4/{xdebug.ini => fpm/drupal-xdebug.ini} (100%) rename 5.5/apache/{xdebug.ini => drupal-xdebug.ini} (100%) rename 5.5/{fpm/xdebug.ini => drupal-xdebug.ini} (100%) rename 5.5/{xdebug.ini => fpm/drupal-xdebug.ini} (100%) rename 5.6/apache/{xdebug.ini => drupal-xdebug.ini} (100%) rename 5.6/{fpm/xdebug.ini => drupal-xdebug.ini} (100%) rename 5.6/{xdebug.ini => fpm/drupal-xdebug.ini} (100%) rename 7.0/apache/{xdebug.ini => drupal-xdebug.ini} (100%) rename 7.0/{fpm/xdebug.ini => drupal-xdebug.ini} (100%) rename 7.0/{xdebug.ini => fpm/drupal-xdebug.ini} (100%) diff --git a/5.4/Dockerfile b/5.4/Dockerfile index 80f968d..feb8b52 100644 --- a/5.4/Dockerfile +++ b/5.4/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile index 7ec7775..6599ff6 100644 --- a/5.4/apache/Dockerfile +++ b/5.4/apache/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/apache/xdebug.ini b/5.4/apache/drupal-xdebug.ini similarity index 100% rename from 5.4/apache/xdebug.ini rename to 5.4/apache/drupal-xdebug.ini diff --git a/5.4/fpm/xdebug.ini b/5.4/drupal-xdebug.ini similarity index 100% rename from 5.4/fpm/xdebug.ini rename to 5.4/drupal-xdebug.ini diff --git a/5.4/fpm/Dockerfile b/5.4/fpm/Dockerfile index b5181cc..40b7e14 100644 --- a/5.4/fpm/Dockerfile +++ b/5.4/fpm/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/xdebug.ini b/5.4/fpm/drupal-xdebug.ini similarity index 100% rename from 5.4/xdebug.ini rename to 5.4/fpm/drupal-xdebug.ini diff --git a/5.5/Dockerfile b/5.5/Dockerfile index b69d7e7..cd7a149 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index 0820531..649066a 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/apache/xdebug.ini b/5.5/apache/drupal-xdebug.ini similarity index 100% rename from 5.5/apache/xdebug.ini rename to 5.5/apache/drupal-xdebug.ini diff --git a/5.5/fpm/xdebug.ini b/5.5/drupal-xdebug.ini similarity index 100% rename from 5.5/fpm/xdebug.ini rename to 5.5/drupal-xdebug.ini diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile index 5ab0336..d5ec3a6 100644 --- a/5.5/fpm/Dockerfile +++ b/5.5/fpm/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/xdebug.ini b/5.5/fpm/drupal-xdebug.ini similarity index 100% rename from 5.5/xdebug.ini rename to 5.5/fpm/drupal-xdebug.ini diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 81375b6..888047c 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index 9cbd1a9..b714379 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/apache/xdebug.ini b/5.6/apache/drupal-xdebug.ini similarity index 100% rename from 5.6/apache/xdebug.ini rename to 5.6/apache/drupal-xdebug.ini diff --git a/5.6/fpm/xdebug.ini b/5.6/drupal-xdebug.ini similarity index 100% rename from 5.6/fpm/xdebug.ini rename to 5.6/drupal-xdebug.ini diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index af398e7..5a02b35 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/xdebug.ini b/5.6/fpm/drupal-xdebug.ini similarity index 100% rename from 5.6/xdebug.ini rename to 5.6/fpm/drupal-xdebug.ini diff --git a/7.0/Dockerfile b/7.0/Dockerfile index 93ccb53..9efd965 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index 4f70d58..443c3a6 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/apache/xdebug.ini b/7.0/apache/drupal-xdebug.ini similarity index 100% rename from 7.0/apache/xdebug.ini rename to 7.0/apache/drupal-xdebug.ini diff --git a/7.0/fpm/xdebug.ini b/7.0/drupal-xdebug.ini similarity index 100% rename from 7.0/fpm/xdebug.ini rename to 7.0/drupal-xdebug.ini diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index 2a6961d..6e47ed5 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/xdebug.ini b/7.0/fpm/drupal-xdebug.ini similarity index 100% rename from 7.0/xdebug.ini rename to 7.0/fpm/drupal-xdebug.ini From 3eecb16d2d6fc0706758aff38361071db594e580 Mon Sep 17 00:00:00 2001 From: zaporylie Date: Tue, 9 Aug 2016 19:25:48 +0200 Subject: [PATCH 04/34] Use wilcard --- 5.4/Dockerfile | 2 +- 5.4/apache/Dockerfile | 2 +- 5.4/fpm/Dockerfile | 2 +- 5.5/Dockerfile | 2 +- 5.5/apache/Dockerfile | 2 +- 5.5/fpm/Dockerfile | 2 +- 5.6/Dockerfile | 2 +- 5.6/apache/Dockerfile | 2 +- 5.6/fpm/Dockerfile | 2 +- 7.0/Dockerfile | 2 +- 7.0/apache/Dockerfile | 2 +- 7.0/fpm/Dockerfile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/5.4/Dockerfile b/5.4/Dockerfile index feb8b52..9b59263 100644 --- a/5.4/Dockerfile +++ b/5.4/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile index 6599ff6..4e12fbc 100644 --- a/5.4/apache/Dockerfile +++ b/5.4/apache/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/fpm/Dockerfile b/5.4/fpm/Dockerfile index 40b7e14..f65f9d2 100644 --- a/5.4/fpm/Dockerfile +++ b/5.4/fpm/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/Dockerfile b/5.5/Dockerfile index cd7a149..b149a30 100644 --- a/5.5/Dockerfile +++ b/5.5/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index 649066a..4c95326 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile index d5ec3a6..a1570d4 100644 --- a/5.5/fpm/Dockerfile +++ b/5.5/fpm/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/Dockerfile b/5.6/Dockerfile index 888047c..76ba636 100644 --- a/5.6/Dockerfile +++ b/5.6/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index b714379..cab04cb 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index 5a02b35..a6e37bf 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/Dockerfile b/7.0/Dockerfile index 9efd965..3849e79 100644 --- a/7.0/Dockerfile +++ b/7.0/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index 443c3a6..421e781 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index 6e47ed5..824c395 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -4,4 +4,4 @@ MAINTAINER drupal-docker RUN pecl install xdebug-beta \ && docker-php-ext-enable xdebug -COPY drupal-xdebug.ini /usr/local/etc/php/conf.d/ +COPY drupal-*.ini /usr/local/etc/php/conf.d/ From df4cb5e6869a47b86668d47a1742b261d30fb0d2 Mon Sep 17 00:00:00 2001 From: zaporylie Date: Tue, 9 Aug 2016 20:09:47 +0200 Subject: [PATCH 05/34] Fix #36: Display errors --- 5.4/apache/drupal-x-error.ini | 7 +++++++ 5.4/drupal-x-error.ini | 7 +++++++ 5.4/fpm/drupal-x-error.ini | 7 +++++++ 5.5/apache/drupal-x-error.ini | 7 +++++++ 5.5/drupal-x-error.ini | 7 +++++++ 5.5/fpm/drupal-x-error.ini | 7 +++++++ 5.6/apache/drupal-x-error.ini | 7 +++++++ 5.6/drupal-x-error.ini | 7 +++++++ 5.6/fpm/drupal-x-error.ini | 7 +++++++ 7.0/apache/drupal-x-error.ini | 7 +++++++ 7.0/drupal-x-error.ini | 7 +++++++ 7.0/fpm/drupal-x-error.ini | 7 +++++++ 12 files changed, 84 insertions(+) create mode 100644 5.4/apache/drupal-x-error.ini create mode 100644 5.4/drupal-x-error.ini create mode 100644 5.4/fpm/drupal-x-error.ini create mode 100644 5.5/apache/drupal-x-error.ini create mode 100644 5.5/drupal-x-error.ini create mode 100644 5.5/fpm/drupal-x-error.ini create mode 100644 5.6/apache/drupal-x-error.ini create mode 100644 5.6/drupal-x-error.ini create mode 100644 5.6/fpm/drupal-x-error.ini create mode 100644 7.0/apache/drupal-x-error.ini create mode 100644 7.0/drupal-x-error.ini create mode 100644 7.0/fpm/drupal-x-error.ini diff --git a/5.4/apache/drupal-x-error.ini b/5.4/apache/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/5.4/apache/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/5.4/drupal-x-error.ini b/5.4/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/5.4/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/5.4/fpm/drupal-x-error.ini b/5.4/fpm/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/5.4/fpm/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/5.5/apache/drupal-x-error.ini b/5.5/apache/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/5.5/apache/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/5.5/drupal-x-error.ini b/5.5/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/5.5/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/5.5/fpm/drupal-x-error.ini b/5.5/fpm/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/5.5/fpm/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/5.6/apache/drupal-x-error.ini b/5.6/apache/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/5.6/apache/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/5.6/drupal-x-error.ini b/5.6/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/5.6/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/5.6/fpm/drupal-x-error.ini b/5.6/fpm/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/5.6/fpm/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/7.0/apache/drupal-x-error.ini b/7.0/apache/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/7.0/apache/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/7.0/drupal-x-error.ini b/7.0/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/7.0/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/7.0/fpm/drupal-x-error.ini b/7.0/fpm/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/7.0/fpm/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On From 2ef196d66b089d0182c3b6e966be1c5ed63204c1 Mon Sep 17 00:00:00 2001 From: Janez Urevc Date: Mon, 26 Sep 2016 11:59:45 +0200 Subject: [PATCH 06/34] Add PHP 5.4 and 5.5 deprecation notice. --- README.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f7d75ee..a50c04a 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,12 @@ PHP-dev for Drupal Version | Type | Tags | Dockerfile --- | --- | --- | --- -5.4 | cli | `5.4-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/Dockerfile) -5.4 | apache | `5.4-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/apache/Dockerfile) -5.4 | fpm | `5.4-fpm`, `5.4` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/fpm/Dockerfile) -5.5 | cli | `5.5-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/Dockerfile) -5.5 | apache | `5.5-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/apache/Dockerfile) -5.5 | fpm | `5.5-fpm`, `5.5` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/fpm/Dockerfile) +5.4 (deprecated) | cli | `5.4-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/Dockerfile) +5.4 (deprecated) | apache | `5.4-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/apache/Dockerfile) +5.4 (deprecated) | fpm | `5.4-fpm`, `5.4` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/fpm/Dockerfile) +5.5 (deprecated) | cli | `5.5-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/Dockerfile) +5.5 (deprecated) | apache | `5.5-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/apache/Dockerfile) +5.5 (deprecated) | fpm | `5.5-fpm`, `5.5` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/fpm/Dockerfile) 5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile) 5.6 | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/apache/Dockerfile) 5.6 | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/fpm/Dockerfile) @@ -18,6 +18,8 @@ Version | Type | Tags | Dockerfile 7.0 | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/apache/Dockerfile) 7.0 | fpm | `7.0-fpm`, `7.fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/fpm/Dockerfile) +**Deprecation notice:** drupaldocker/php:5.4 and drupaldocker/php:5.5 EOL date: **December 13, 2016** + # Quickstart: PHP 5.6 + Apache From 9800299a9307c2a4087c7c1088b08d57da4fa8d1 Mon Sep 17 00:00:00 2001 From: Janez Urevc Date: Mon, 26 Sep 2016 11:57:40 +0200 Subject: [PATCH 07/34] Add alpine version of images images. --- .travis.yml | 4 ++++ 5.6-alpine/Dockerfile | 9 +++++++++ 5.6-alpine/drupal-x-error.ini | 7 +++++++ 5.6-alpine/drupal-xdebug.ini | 8 ++++++++ 5.6-alpine/fpm/Dockerfile | 9 +++++++++ 5.6-alpine/fpm/drupal-x-error.ini | 7 +++++++ 5.6-alpine/fpm/drupal-xdebug.ini | 8 ++++++++ 7.0-alpine/Dockerfile | 9 +++++++++ 7.0-alpine/drupal-x-error.ini | 7 +++++++ 7.0-alpine/drupal-xdebug.ini | 8 ++++++++ 7.0-alpine/fpm/Dockerfile | 9 +++++++++ 7.0-alpine/fpm/drupal-x-error.ini | 7 +++++++ 7.0-alpine/fpm/drupal-xdebug.ini | 8 ++++++++ README.md | 4 ++++ 14 files changed, 104 insertions(+) create mode 100644 5.6-alpine/Dockerfile create mode 100644 5.6-alpine/drupal-x-error.ini create mode 100644 5.6-alpine/drupal-xdebug.ini create mode 100644 5.6-alpine/fpm/Dockerfile create mode 100644 5.6-alpine/fpm/drupal-x-error.ini create mode 100644 5.6-alpine/fpm/drupal-xdebug.ini create mode 100644 7.0-alpine/Dockerfile create mode 100644 7.0-alpine/drupal-x-error.ini create mode 100644 7.0-alpine/drupal-xdebug.ini create mode 100644 7.0-alpine/fpm/Dockerfile create mode 100644 7.0-alpine/fpm/drupal-x-error.ini create mode 100644 7.0-alpine/fpm/drupal-xdebug.ini diff --git a/.travis.yml b/.travis.yml index d833c95..8b7e628 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,10 @@ env: - DOCKERFILE="7.0" - DOCKERFILE="7.0/apache" - DOCKERFILE="7.0/fpm" + - DOCKERFILE="5.6-alpine" + - DOCKERFILE="5.6-alpine/fpm" + - DOCKERFILE="7.0-alpine" + - DOCKERFILE="7.0-alpine/fpm" before_script: - docker version diff --git a/5.6-alpine/Dockerfile b/5.6-alpine/Dockerfile new file mode 100644 index 0000000..91c3f78 --- /dev/null +++ b/5.6-alpine/Dockerfile @@ -0,0 +1,9 @@ +FROM drupaldocker/php:5.6-alpine-cli +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-beta \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.6-alpine/drupal-x-error.ini b/5.6-alpine/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/5.6-alpine/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/5.6-alpine/drupal-xdebug.ini b/5.6-alpine/drupal-xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/5.6-alpine/drupal-xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/5.6-alpine/fpm/Dockerfile b/5.6-alpine/fpm/Dockerfile new file mode 100644 index 0000000..f9b8f23 --- /dev/null +++ b/5.6-alpine/fpm/Dockerfile @@ -0,0 +1,9 @@ +FROM drupaldocker/php:5.6-alpine-fpm +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-beta \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.6-alpine/fpm/drupal-x-error.ini b/5.6-alpine/fpm/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/5.6-alpine/fpm/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/5.6-alpine/fpm/drupal-xdebug.ini b/5.6-alpine/fpm/drupal-xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/5.6-alpine/fpm/drupal-xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/7.0-alpine/Dockerfile b/7.0-alpine/Dockerfile new file mode 100644 index 0000000..0af5c52 --- /dev/null +++ b/7.0-alpine/Dockerfile @@ -0,0 +1,9 @@ +FROM drupaldocker/php:7.0-alpine-cli +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-beta \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0-alpine/drupal-x-error.ini b/7.0-alpine/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/7.0-alpine/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/7.0-alpine/drupal-xdebug.ini b/7.0-alpine/drupal-xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/7.0-alpine/drupal-xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/7.0-alpine/fpm/Dockerfile b/7.0-alpine/fpm/Dockerfile new file mode 100644 index 0000000..7768fb3 --- /dev/null +++ b/7.0-alpine/fpm/Dockerfile @@ -0,0 +1,9 @@ +FROM drupaldocker/php:7.0-alpine-fpm +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-beta \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0-alpine/fpm/drupal-x-error.ini b/7.0-alpine/fpm/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/7.0-alpine/fpm/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/7.0-alpine/fpm/drupal-xdebug.ini b/7.0-alpine/fpm/drupal-xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/7.0-alpine/fpm/drupal-xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 diff --git a/README.md b/README.md index a50c04a..fbc9e4d 100644 --- a/README.md +++ b/README.md @@ -17,6 +17,10 @@ Version | Type | Tags | Dockerfile 7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile) 7.0 | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/apache/Dockerfile) 7.0 | fpm | `7.0-fpm`, `7.fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/fpm/Dockerfile) +5.6-alpine | cli | `5.6-alpine-cli`, | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/Dockerfile) +5.6-apline | fpm | `5.6-alpine-fpm`,`5.6-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/fpm/Dockerfile) +7.0-alpine | cli | `7.0-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/Dockerfile) +7.0-alpine | fpm | `7.0-alpinefpm`, `7.0-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/fpm/Dockerfile) **Deprecation notice:** drupaldocker/php:5.4 and drupaldocker/php:5.5 EOL date: **December 13, 2016** From 1de671ed0f13b1b4417171467d27b7b892958983 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 28 Sep 2016 10:02:24 +0200 Subject: [PATCH 08/34] Fix typo in tag name and change order --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fbc9e4d..1f95967 100644 --- a/README.md +++ b/README.md @@ -12,15 +12,15 @@ Version | Type | Tags | Dockerfile 5.5 (deprecated) | apache | `5.5-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/apache/Dockerfile) 5.5 (deprecated) | fpm | `5.5-fpm`, `5.5` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/fpm/Dockerfile) 5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile) + | | `5.6-alpine-cli`, | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/Dockerfile) 5.6 | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/apache/Dockerfile) 5.6 | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/fpm/Dockerfile) + | | `5.6-alpine-fpm`,`5.6-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/fpm/Dockerfile) 7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile) + | | `7.0-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/Dockerfile) 7.0 | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/apache/Dockerfile) 7.0 | fpm | `7.0-fpm`, `7.fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/fpm/Dockerfile) -5.6-alpine | cli | `5.6-alpine-cli`, | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/Dockerfile) -5.6-apline | fpm | `5.6-alpine-fpm`,`5.6-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/fpm/Dockerfile) -7.0-alpine | cli | `7.0-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/Dockerfile) -7.0-alpine | fpm | `7.0-alpinefpm`, `7.0-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/fpm/Dockerfile) + | | `7.0-alpine-fpm`, `7.0-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/fpm/Dockerfile) **Deprecation notice:** drupaldocker/php:5.4 and drupaldocker/php:5.5 EOL date: **December 13, 2016** From 89daa7bdf8cd0dd396cd23fd4804655a6f37522b Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 28 Sep 2016 15:34:28 +0200 Subject: [PATCH 09/34] Unify README --- README.md | 29 +++++++---------------------- 1 file changed, 7 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 1f95967..7b78cd2 100644 --- a/README.md +++ b/README.md @@ -6,35 +6,20 @@ PHP-dev for Drupal Version | Type | Tags | Dockerfile --- | --- | --- | --- 5.4 (deprecated) | cli | `5.4-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/Dockerfile) -5.4 (deprecated) | apache | `5.4-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/apache/Dockerfile) -5.4 (deprecated) | fpm | `5.4-fpm`, `5.4` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/fpm/Dockerfile) + | apache | `5.4-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/apache/Dockerfile) + | fpm | `5.4-fpm`, `5.4` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/fpm/Dockerfile) 5.5 (deprecated) | cli | `5.5-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/Dockerfile) -5.5 (deprecated) | apache | `5.5-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/apache/Dockerfile) -5.5 (deprecated) | fpm | `5.5-fpm`, `5.5` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/fpm/Dockerfile) + | apache | `5.5-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/apache/Dockerfile) + | fpm | `5.5-fpm`, `5.5` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/fpm/Dockerfile) 5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile) | | `5.6-alpine-cli`, | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/Dockerfile) 5.6 | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/apache/Dockerfile) -5.6 | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/fpm/Dockerfile) + | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/fpm/Dockerfile) | | `5.6-alpine-fpm`,`5.6-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/fpm/Dockerfile) 7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile) | | `7.0-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/Dockerfile) -7.0 | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/apache/Dockerfile) -7.0 | fpm | `7.0-fpm`, `7.fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/fpm/Dockerfile) + | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/apache/Dockerfile) + | fpm | `7.0-fpm`, `7.fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/fpm/Dockerfile) | | `7.0-alpine-fpm`, `7.0-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/fpm/Dockerfile) **Deprecation notice:** drupaldocker/php:5.4 and drupaldocker/php:5.5 EOL date: **December 13, 2016** - -# Quickstart: - -PHP 5.6 + Apache -```bash -docker run -dP drupaldocker/php-dev:apache -``` - -# Features - -- xdebug - -# More - -Read more about PHP image in [master README](https://github.com/drupal-docker/php/blob/master/README.md). From d2d18ca238d3f9b48d5ed788583116a481a9a1c7 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 28 Sep 2016 15:38:54 +0200 Subject: [PATCH 10/34] Start with tests --- .travis.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b7e628..851a7c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,28 +5,29 @@ services: env: matrix: - - DOCKERFILE="5.4" - - DOCKERFILE="5.4/apache" - - DOCKERFILE="5.4/fpm" - - DOCKERFILE="5.5" - - DOCKERFILE="5.5/apache" - - DOCKERFILE="5.5/fpm" - - DOCKERFILE="5.6" - - DOCKERFILE="5.6/apache" - - DOCKERFILE="5.6/fpm" - - DOCKERFILE="7.0" - - DOCKERFILE="7.0/apache" - - DOCKERFILE="7.0/fpm" - - DOCKERFILE="5.6-alpine" - - DOCKERFILE="5.6-alpine/fpm" - - DOCKERFILE="7.0-alpine" - - DOCKERFILE="7.0-alpine/fpm" + - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.4" + - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.4" + - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.4" + - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.5" + - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.5" + - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.5" + - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.6" + - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.6" + - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.6" + - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="5.6" + - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="5.6" + - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.0" + - DOCKERFILE="Dockerfile-apache" DOCKERPATH="7.0" + - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.0" + - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="7.0" + - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="7.0" before_script: - docker version script: - - docker build -t ${DOCKERFILE} ./${DOCKERFILE} + - docker build -f ./${DOCKERPATH}/${DOCKERFILE} -t ${DOCKERPATH} ./${DOCKERPATH} after_script: - docker images + - docker run --rm -ti ${DOCKERPATH} php -i From 7fe6c6d3e985663060234bb4402f431a09d6256c Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 28 Sep 2016 15:58:20 +0200 Subject: [PATCH 11/34] Change repo structure --- 5.4/{apache/Dockerfile => Dockerfile-apache} | 0 5.4/{Dockerfile => Dockerfile-cli} | 0 5.4/{fpm/Dockerfile => Dockerfile-fpm} | 0 5.4/apache/drupal-x-error.ini | 7 ------- 5.4/apache/drupal-xdebug.ini | 8 -------- 5.4/fpm/drupal-x-error.ini | 7 ------- 5.4/fpm/drupal-xdebug.ini | 8 -------- 5.5/{apache/Dockerfile => Dockerfile-apache} | 0 5.5/{Dockerfile => Dockerfile-cli} | 0 5.5/{fpm/Dockerfile => Dockerfile-fpm} | 0 5.5/apache/drupal-x-error.ini | 7 ------- 5.5/apache/drupal-xdebug.ini | 8 -------- 5.5/fpm/drupal-x-error.ini | 7 ------- 5.5/fpm/drupal-xdebug.ini | 8 -------- 5.6-alpine/drupal-x-error.ini | 7 ------- 5.6-alpine/drupal-xdebug.ini | 8 -------- 5.6-alpine/fpm/drupal-x-error.ini | 7 ------- 5.6-alpine/fpm/drupal-xdebug.ini | 8 -------- 5.6-alpine/Dockerfile => 5.6/Dockerfile-alpine-cli | 0 5.6-alpine/fpm/Dockerfile => 5.6/Dockerfile-alpine-fpm | 0 5.6/{apache/Dockerfile => Dockerfile-apache} | 0 5.6/{Dockerfile => Dockerfile-cli} | 0 5.6/{fpm/Dockerfile => Dockerfile-fpm} | 0 5.6/apache/drupal-x-error.ini | 7 ------- 5.6/apache/drupal-xdebug.ini | 8 -------- 5.6/fpm/drupal-x-error.ini | 7 ------- 5.6/fpm/drupal-xdebug.ini | 8 -------- 7.0-alpine/drupal-x-error.ini | 7 ------- 7.0-alpine/drupal-xdebug.ini | 8 -------- 7.0-alpine/fpm/drupal-x-error.ini | 7 ------- 7.0-alpine/fpm/drupal-xdebug.ini | 8 -------- 7.0-alpine/Dockerfile => 7.0/Dockerfile-alpine-cli | 0 7.0-alpine/fpm/Dockerfile => 7.0/Dockerfile-alpine-fpm | 0 7.0/{apache/Dockerfile => Dockerfile-apache} | 0 7.0/{Dockerfile => Dockerfile-cli} | 0 7.0/{fpm/Dockerfile => Dockerfile-fpm} | 0 7.0/apache/drupal-x-error.ini | 7 ------- 7.0/apache/drupal-xdebug.ini | 8 -------- 7.0/fpm/drupal-x-error.ini | 7 ------- 7.0/fpm/drupal-xdebug.ini | 8 -------- 40 files changed, 180 deletions(-) rename 5.4/{apache/Dockerfile => Dockerfile-apache} (100%) rename 5.4/{Dockerfile => Dockerfile-cli} (100%) rename 5.4/{fpm/Dockerfile => Dockerfile-fpm} (100%) delete mode 100644 5.4/apache/drupal-x-error.ini delete mode 100644 5.4/apache/drupal-xdebug.ini delete mode 100644 5.4/fpm/drupal-x-error.ini delete mode 100644 5.4/fpm/drupal-xdebug.ini rename 5.5/{apache/Dockerfile => Dockerfile-apache} (100%) rename 5.5/{Dockerfile => Dockerfile-cli} (100%) rename 5.5/{fpm/Dockerfile => Dockerfile-fpm} (100%) delete mode 100644 5.5/apache/drupal-x-error.ini delete mode 100644 5.5/apache/drupal-xdebug.ini delete mode 100644 5.5/fpm/drupal-x-error.ini delete mode 100644 5.5/fpm/drupal-xdebug.ini delete mode 100644 5.6-alpine/drupal-x-error.ini delete mode 100644 5.6-alpine/drupal-xdebug.ini delete mode 100644 5.6-alpine/fpm/drupal-x-error.ini delete mode 100644 5.6-alpine/fpm/drupal-xdebug.ini rename 5.6-alpine/Dockerfile => 5.6/Dockerfile-alpine-cli (100%) rename 5.6-alpine/fpm/Dockerfile => 5.6/Dockerfile-alpine-fpm (100%) rename 5.6/{apache/Dockerfile => Dockerfile-apache} (100%) rename 5.6/{Dockerfile => Dockerfile-cli} (100%) rename 5.6/{fpm/Dockerfile => Dockerfile-fpm} (100%) delete mode 100644 5.6/apache/drupal-x-error.ini delete mode 100644 5.6/apache/drupal-xdebug.ini delete mode 100644 5.6/fpm/drupal-x-error.ini delete mode 100644 5.6/fpm/drupal-xdebug.ini delete mode 100644 7.0-alpine/drupal-x-error.ini delete mode 100644 7.0-alpine/drupal-xdebug.ini delete mode 100644 7.0-alpine/fpm/drupal-x-error.ini delete mode 100644 7.0-alpine/fpm/drupal-xdebug.ini rename 7.0-alpine/Dockerfile => 7.0/Dockerfile-alpine-cli (100%) rename 7.0-alpine/fpm/Dockerfile => 7.0/Dockerfile-alpine-fpm (100%) rename 7.0/{apache/Dockerfile => Dockerfile-apache} (100%) rename 7.0/{Dockerfile => Dockerfile-cli} (100%) rename 7.0/{fpm/Dockerfile => Dockerfile-fpm} (100%) delete mode 100644 7.0/apache/drupal-x-error.ini delete mode 100644 7.0/apache/drupal-xdebug.ini delete mode 100644 7.0/fpm/drupal-x-error.ini delete mode 100644 7.0/fpm/drupal-xdebug.ini diff --git a/5.4/apache/Dockerfile b/5.4/Dockerfile-apache similarity index 100% rename from 5.4/apache/Dockerfile rename to 5.4/Dockerfile-apache diff --git a/5.4/Dockerfile b/5.4/Dockerfile-cli similarity index 100% rename from 5.4/Dockerfile rename to 5.4/Dockerfile-cli diff --git a/5.4/fpm/Dockerfile b/5.4/Dockerfile-fpm similarity index 100% rename from 5.4/fpm/Dockerfile rename to 5.4/Dockerfile-fpm diff --git a/5.4/apache/drupal-x-error.ini b/5.4/apache/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/5.4/apache/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/5.4/apache/drupal-xdebug.ini b/5.4/apache/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/5.4/apache/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/5.4/fpm/drupal-x-error.ini b/5.4/fpm/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/5.4/fpm/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/5.4/fpm/drupal-xdebug.ini b/5.4/fpm/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/5.4/fpm/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/5.5/apache/Dockerfile b/5.5/Dockerfile-apache similarity index 100% rename from 5.5/apache/Dockerfile rename to 5.5/Dockerfile-apache diff --git a/5.5/Dockerfile b/5.5/Dockerfile-cli similarity index 100% rename from 5.5/Dockerfile rename to 5.5/Dockerfile-cli diff --git a/5.5/fpm/Dockerfile b/5.5/Dockerfile-fpm similarity index 100% rename from 5.5/fpm/Dockerfile rename to 5.5/Dockerfile-fpm diff --git a/5.5/apache/drupal-x-error.ini b/5.5/apache/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/5.5/apache/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/5.5/apache/drupal-xdebug.ini b/5.5/apache/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/5.5/apache/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/5.5/fpm/drupal-x-error.ini b/5.5/fpm/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/5.5/fpm/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/5.5/fpm/drupal-xdebug.ini b/5.5/fpm/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/5.5/fpm/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/5.6-alpine/drupal-x-error.ini b/5.6-alpine/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/5.6-alpine/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/5.6-alpine/drupal-xdebug.ini b/5.6-alpine/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/5.6-alpine/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/5.6-alpine/fpm/drupal-x-error.ini b/5.6-alpine/fpm/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/5.6-alpine/fpm/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/5.6-alpine/fpm/drupal-xdebug.ini b/5.6-alpine/fpm/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/5.6-alpine/fpm/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/5.6-alpine/Dockerfile b/5.6/Dockerfile-alpine-cli similarity index 100% rename from 5.6-alpine/Dockerfile rename to 5.6/Dockerfile-alpine-cli diff --git a/5.6-alpine/fpm/Dockerfile b/5.6/Dockerfile-alpine-fpm similarity index 100% rename from 5.6-alpine/fpm/Dockerfile rename to 5.6/Dockerfile-alpine-fpm diff --git a/5.6/apache/Dockerfile b/5.6/Dockerfile-apache similarity index 100% rename from 5.6/apache/Dockerfile rename to 5.6/Dockerfile-apache diff --git a/5.6/Dockerfile b/5.6/Dockerfile-cli similarity index 100% rename from 5.6/Dockerfile rename to 5.6/Dockerfile-cli diff --git a/5.6/fpm/Dockerfile b/5.6/Dockerfile-fpm similarity index 100% rename from 5.6/fpm/Dockerfile rename to 5.6/Dockerfile-fpm diff --git a/5.6/apache/drupal-x-error.ini b/5.6/apache/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/5.6/apache/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/5.6/apache/drupal-xdebug.ini b/5.6/apache/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/5.6/apache/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/5.6/fpm/drupal-x-error.ini b/5.6/fpm/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/5.6/fpm/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/5.6/fpm/drupal-xdebug.ini b/5.6/fpm/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/5.6/fpm/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/7.0-alpine/drupal-x-error.ini b/7.0-alpine/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/7.0-alpine/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/7.0-alpine/drupal-xdebug.ini b/7.0-alpine/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/7.0-alpine/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/7.0-alpine/fpm/drupal-x-error.ini b/7.0-alpine/fpm/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/7.0-alpine/fpm/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/7.0-alpine/fpm/drupal-xdebug.ini b/7.0-alpine/fpm/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/7.0-alpine/fpm/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/7.0-alpine/Dockerfile b/7.0/Dockerfile-alpine-cli similarity index 100% rename from 7.0-alpine/Dockerfile rename to 7.0/Dockerfile-alpine-cli diff --git a/7.0-alpine/fpm/Dockerfile b/7.0/Dockerfile-alpine-fpm similarity index 100% rename from 7.0-alpine/fpm/Dockerfile rename to 7.0/Dockerfile-alpine-fpm diff --git a/7.0/apache/Dockerfile b/7.0/Dockerfile-apache similarity index 100% rename from 7.0/apache/Dockerfile rename to 7.0/Dockerfile-apache diff --git a/7.0/Dockerfile b/7.0/Dockerfile-cli similarity index 100% rename from 7.0/Dockerfile rename to 7.0/Dockerfile-cli diff --git a/7.0/fpm/Dockerfile b/7.0/Dockerfile-fpm similarity index 100% rename from 7.0/fpm/Dockerfile rename to 7.0/Dockerfile-fpm diff --git a/7.0/apache/drupal-x-error.ini b/7.0/apache/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/7.0/apache/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/7.0/apache/drupal-xdebug.ini b/7.0/apache/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/7.0/apache/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/7.0/fpm/drupal-x-error.ini b/7.0/fpm/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/7.0/fpm/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/7.0/fpm/drupal-xdebug.ini b/7.0/fpm/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/7.0/fpm/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 From 89ce20a003c0773f053f321cc893a2f358509662 Mon Sep 17 00:00:00 2001 From: Janez Urevc Date: Thu, 6 Oct 2016 18:08:50 +0200 Subject: [PATCH 12/34] Override opcache configuration. --- 5.5/drupal-x-opcache.ini | 1 + 5.6/drupal-x-opcache.ini | 1 + 7.0/drupal-x-opcache.ini | 1 + 3 files changed, 3 insertions(+) create mode 100644 5.5/drupal-x-opcache.ini create mode 100644 5.6/drupal-x-opcache.ini create mode 100644 7.0/drupal-x-opcache.ini diff --git a/5.5/drupal-x-opcache.ini b/5.5/drupal-x-opcache.ini new file mode 100644 index 0000000..20272f9 --- /dev/null +++ b/5.5/drupal-x-opcache.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=2 diff --git a/5.6/drupal-x-opcache.ini b/5.6/drupal-x-opcache.ini new file mode 100644 index 0000000..20272f9 --- /dev/null +++ b/5.6/drupal-x-opcache.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=2 diff --git a/7.0/drupal-x-opcache.ini b/7.0/drupal-x-opcache.ini new file mode 100644 index 0000000..20272f9 --- /dev/null +++ b/7.0/drupal-x-opcache.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=2 From 1f768694cede2ddcefbc6e07ce20b00488078050 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 15 Dec 2016 12:04:13 +0100 Subject: [PATCH 13/34] Deprecate 5.4 and 5.5 in dev --- .travis.yml | 6 ------ 5.4/Dockerfile-apache | 7 ------- 5.4/Dockerfile-cli | 7 ------- 5.4/Dockerfile-fpm | 7 ------- 5.4/drupal-x-error.ini | 7 ------- 5.4/drupal-xdebug.ini | 8 -------- 5.5/Dockerfile-apache | 7 ------- 5.5/Dockerfile-cli | 7 ------- 5.5/Dockerfile-fpm | 7 ------- 5.5/drupal-x-error.ini | 7 ------- 5.5/drupal-x-opcache.ini | 1 - 5.5/drupal-xdebug.ini | 8 -------- README.md | 8 -------- 13 files changed, 87 deletions(-) delete mode 100644 5.4/Dockerfile-apache delete mode 100644 5.4/Dockerfile-cli delete mode 100644 5.4/Dockerfile-fpm delete mode 100644 5.4/drupal-x-error.ini delete mode 100644 5.4/drupal-xdebug.ini delete mode 100644 5.5/Dockerfile-apache delete mode 100644 5.5/Dockerfile-cli delete mode 100644 5.5/Dockerfile-fpm delete mode 100644 5.5/drupal-x-error.ini delete mode 100644 5.5/drupal-x-opcache.ini delete mode 100644 5.5/drupal-xdebug.ini diff --git a/.travis.yml b/.travis.yml index 851a7c9..4d7fc8f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,12 +5,6 @@ services: env: matrix: - - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.4" - - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.4" - - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.4" - - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.5" - - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.5" - - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.5" - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.6" - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.6" - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.6" diff --git a/5.4/Dockerfile-apache b/5.4/Dockerfile-apache deleted file mode 100644 index 4e12fbc..0000000 --- a/5.4/Dockerfile-apache +++ /dev/null @@ -1,7 +0,0 @@ -FROM drupaldocker/php:5.4-apache -MAINTAINER drupal-docker - -RUN pecl install xdebug-beta \ - && docker-php-ext-enable xdebug - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/Dockerfile-cli b/5.4/Dockerfile-cli deleted file mode 100644 index 9b59263..0000000 --- a/5.4/Dockerfile-cli +++ /dev/null @@ -1,7 +0,0 @@ -FROM drupaldocker/php:5.4-cli -MAINTAINER drupal-docker - -RUN pecl install xdebug-beta \ - && docker-php-ext-enable xdebug - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/Dockerfile-fpm b/5.4/Dockerfile-fpm deleted file mode 100644 index f65f9d2..0000000 --- a/5.4/Dockerfile-fpm +++ /dev/null @@ -1,7 +0,0 @@ -FROM drupaldocker/php:5.4-fpm -MAINTAINER drupal-docker - -RUN pecl install xdebug-beta \ - && docker-php-ext-enable xdebug - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/drupal-x-error.ini b/5.4/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/5.4/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/5.4/drupal-xdebug.ini b/5.4/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/5.4/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/5.5/Dockerfile-apache b/5.5/Dockerfile-apache deleted file mode 100644 index 4c95326..0000000 --- a/5.5/Dockerfile-apache +++ /dev/null @@ -1,7 +0,0 @@ -FROM drupaldocker/php:5.5-apache -MAINTAINER drupal-docker - -RUN pecl install xdebug-beta \ - && docker-php-ext-enable xdebug - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/Dockerfile-cli b/5.5/Dockerfile-cli deleted file mode 100644 index b149a30..0000000 --- a/5.5/Dockerfile-cli +++ /dev/null @@ -1,7 +0,0 @@ -FROM drupaldocker/php:5.5-cli -MAINTAINER drupal-docker - -RUN pecl install xdebug-beta \ - && docker-php-ext-enable xdebug - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/Dockerfile-fpm b/5.5/Dockerfile-fpm deleted file mode 100644 index a1570d4..0000000 --- a/5.5/Dockerfile-fpm +++ /dev/null @@ -1,7 +0,0 @@ -FROM drupaldocker/php:5.5-fpm -MAINTAINER drupal-docker - -RUN pecl install xdebug-beta \ - && docker-php-ext-enable xdebug - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/drupal-x-error.ini b/5.5/drupal-x-error.ini deleted file mode 100644 index 271574c..0000000 --- a/5.5/drupal-x-error.ini +++ /dev/null @@ -1,7 +0,0 @@ -error_reporting = E_ALL -display_errors = On -display_startup_errors = On -log_errors = On -ignore_repeated_errors = Off -ignore_repeated_source = Off -track_errors = On diff --git a/5.5/drupal-x-opcache.ini b/5.5/drupal-x-opcache.ini deleted file mode 100644 index 20272f9..0000000 --- a/5.5/drupal-x-opcache.ini +++ /dev/null @@ -1 +0,0 @@ -opcache.revalidate_freq=2 diff --git a/5.5/drupal-xdebug.ini b/5.5/drupal-xdebug.ini deleted file mode 100644 index c4963d5..0000000 --- a/5.5/drupal-xdebug.ini +++ /dev/null @@ -1,8 +0,0 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 -xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 -xdebug.max_nesting_level = 1000 diff --git a/README.md b/README.md index 7b78cd2..9698e39 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,6 @@ PHP-dev for Drupal Version | Type | Tags | Dockerfile --- | --- | --- | --- -5.4 (deprecated) | cli | `5.4-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/Dockerfile) - | apache | `5.4-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/apache/Dockerfile) - | fpm | `5.4-fpm`, `5.4` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.4/fpm/Dockerfile) -5.5 (deprecated) | cli | `5.5-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/Dockerfile) - | apache | `5.5-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/apache/Dockerfile) - | fpm | `5.5-fpm`, `5.5` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.5/fpm/Dockerfile) 5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile) | | `5.6-alpine-cli`, | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/Dockerfile) 5.6 | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/apache/Dockerfile) @@ -21,5 +15,3 @@ Version | Type | Tags | Dockerfile | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/apache/Dockerfile) | fpm | `7.0-fpm`, `7.fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/fpm/Dockerfile) | | `7.0-alpine-fpm`, `7.0-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/fpm/Dockerfile) - -**Deprecation notice:** drupaldocker/php:5.4 and drupaldocker/php:5.5 EOL date: **December 13, 2016** From dc2f4866ef5e06cea3fb6457f05c08002ecf7af8 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 15 Dec 2016 12:15:58 +0100 Subject: [PATCH 14/34] Add support for 7.1 --- .travis.yml | 5 +++++ 7.1/Dockerfile-alpine-cli | 9 +++++++++ 7.1/Dockerfile-alpine-fpm | 9 +++++++++ 7.1/Dockerfile-apache | 7 +++++++ 7.1/Dockerfile-cli | 7 +++++++ 7.1/Dockerfile-fpm | 7 +++++++ 7.1/drupal-x-error.ini | 7 +++++++ 7.1/drupal-x-opcache.ini | 1 + 7.1/drupal-xdebug.ini | 8 ++++++++ 9 files changed, 60 insertions(+) create mode 100644 7.1/Dockerfile-alpine-cli create mode 100644 7.1/Dockerfile-alpine-fpm create mode 100644 7.1/Dockerfile-apache create mode 100644 7.1/Dockerfile-cli create mode 100644 7.1/Dockerfile-fpm create mode 100644 7.1/drupal-x-error.ini create mode 100644 7.1/drupal-x-opcache.ini create mode 100644 7.1/drupal-xdebug.ini diff --git a/.travis.yml b/.travis.yml index 851a7c9..4391d0c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,11 @@ env: - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.0" - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="7.0" - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="7.0" + - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.1" + - DOCKERFILE="Dockerfile-apache" DOCKERPATH="7.1" + - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.1" + - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="7.1" + - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="7.1" before_script: - docker version diff --git a/7.1/Dockerfile-alpine-cli b/7.1/Dockerfile-alpine-cli new file mode 100644 index 0000000..c1af46e --- /dev/null +++ b/7.1/Dockerfile-alpine-cli @@ -0,0 +1,9 @@ +FROM drupaldocker/php:7.1-alpine-cli +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-beta \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-alpine-fpm b/7.1/Dockerfile-alpine-fpm new file mode 100644 index 0000000..350f0b8 --- /dev/null +++ b/7.1/Dockerfile-alpine-fpm @@ -0,0 +1,9 @@ +FROM drupaldocker/php:7.1-alpine-fpm +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-beta \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-apache b/7.1/Dockerfile-apache new file mode 100644 index 0000000..8f26ef3 --- /dev/null +++ b/7.1/Dockerfile-apache @@ -0,0 +1,7 @@ +FROM drupaldocker/php:7.1-apache +MAINTAINER drupal-docker + +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-cli b/7.1/Dockerfile-cli new file mode 100644 index 0000000..020b46a --- /dev/null +++ b/7.1/Dockerfile-cli @@ -0,0 +1,7 @@ +FROM drupaldocker/php:7.1-cli +MAINTAINER drupal-docker + +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-fpm b/7.1/Dockerfile-fpm new file mode 100644 index 0000000..37d33c2 --- /dev/null +++ b/7.1/Dockerfile-fpm @@ -0,0 +1,7 @@ +FROM drupaldocker/php:7.1-fpm +MAINTAINER drupal-docker + +RUN pecl install xdebug-beta \ + && docker-php-ext-enable xdebug + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/drupal-x-error.ini b/7.1/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/7.1/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/7.1/drupal-x-opcache.ini b/7.1/drupal-x-opcache.ini new file mode 100644 index 0000000..20272f9 --- /dev/null +++ b/7.1/drupal-x-opcache.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=2 diff --git a/7.1/drupal-xdebug.ini b/7.1/drupal-xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/7.1/drupal-xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 From b10cfb9d0119eb4a8b09315887e51f1c0ceb0094 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 15 Dec 2016 12:30:25 +0100 Subject: [PATCH 15/34] Add 7.1 to docs --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9698e39..abd4cf7 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Version | Type | Tags | Dockerfile --- | --- | --- | --- 5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile) | | `5.6-alpine-cli`, | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/Dockerfile) -5.6 | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/apache/Dockerfile) + | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/apache/Dockerfile) | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/fpm/Dockerfile) | | `5.6-alpine-fpm`,`5.6-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/fpm/Dockerfile) 7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile) @@ -15,3 +15,8 @@ Version | Type | Tags | Dockerfile | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/apache/Dockerfile) | fpm | `7.0-fpm`, `7.fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/fpm/Dockerfile) | | `7.0-alpine-fpm`, `7.0-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/fpm/Dockerfile) +7.1 | cli | `7.1-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile) + | | `7.1-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1-alpine/Dockerfile) + | apache | `7.1-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/apache/Dockerfile) + | fpm | `7.1-fpm`, `7.1` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/fpm/Dockerfile) + | | `7.1-alpine-fpm`, `7.1-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1-alpine/fpm/Dockerfile) From 3a16e4967d044c64dba1ef6854ffdec643e76ae5 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 10 Jan 2018 09:18:13 +0100 Subject: [PATCH 16/34] Lock on version number for xdebug by implementing explicit version constraint --- 5.6/Dockerfile-alpine-cli | 2 +- 5.6/Dockerfile-alpine-fpm | 2 +- 5.6/Dockerfile-apache | 2 +- 5.6/Dockerfile-cli | 2 +- 5.6/Dockerfile-fpm | 2 +- 7.0/Dockerfile-alpine-cli | 2 +- 7.0/Dockerfile-alpine-fpm | 2 +- 7.0/Dockerfile-apache | 2 +- 7.0/Dockerfile-cli | 2 +- 7.0/Dockerfile-fpm | 2 +- 7.1/Dockerfile-alpine-cli | 2 +- 7.1/Dockerfile-alpine-fpm | 2 +- 7.1/Dockerfile-apache | 2 +- 7.1/Dockerfile-cli | 2 +- 7.1/Dockerfile-fpm | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/5.6/Dockerfile-alpine-cli b/5.6/Dockerfile-alpine-cli index 91c3f78..25c5278 100644 --- a/5.6/Dockerfile-alpine-cli +++ b/5.6/Dockerfile-alpine-cli @@ -2,7 +2,7 @@ FROM drupaldocker/php:5.6-alpine-cli MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-beta \ + && pecl install xdebug-2.5.5 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps diff --git a/5.6/Dockerfile-alpine-fpm b/5.6/Dockerfile-alpine-fpm index f9b8f23..da09336 100644 --- a/5.6/Dockerfile-alpine-fpm +++ b/5.6/Dockerfile-alpine-fpm @@ -2,7 +2,7 @@ FROM drupaldocker/php:5.6-alpine-fpm MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-beta \ + && pecl install xdebug-2.5.5 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps diff --git a/5.6/Dockerfile-apache b/5.6/Dockerfile-apache index cab04cb..1c63c24 100644 --- a/5.6/Dockerfile-apache +++ b/5.6/Dockerfile-apache @@ -1,7 +1,7 @@ FROM drupaldocker/php:5.6-apache MAINTAINER drupal-docker -RUN pecl install xdebug-beta \ +RUN pecl install xdebug-2.5.5 \ && docker-php-ext-enable xdebug COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/Dockerfile-cli b/5.6/Dockerfile-cli index 76ba636..3c42779 100644 --- a/5.6/Dockerfile-cli +++ b/5.6/Dockerfile-cli @@ -1,7 +1,7 @@ FROM drupaldocker/php:5.6-cli MAINTAINER drupal-docker -RUN pecl install xdebug-beta \ +RUN pecl install xdebug-2.5.5 \ && docker-php-ext-enable xdebug COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/Dockerfile-fpm b/5.6/Dockerfile-fpm index a6e37bf..cba500e 100644 --- a/5.6/Dockerfile-fpm +++ b/5.6/Dockerfile-fpm @@ -1,7 +1,7 @@ FROM drupaldocker/php:5.6-fpm MAINTAINER drupal-docker -RUN pecl install xdebug-beta \ +RUN pecl install xdebug-2.5.5 \ && docker-php-ext-enable xdebug COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/Dockerfile-alpine-cli b/7.0/Dockerfile-alpine-cli index 0af5c52..1efa735 100644 --- a/7.0/Dockerfile-alpine-cli +++ b/7.0/Dockerfile-alpine-cli @@ -2,7 +2,7 @@ FROM drupaldocker/php:7.0-alpine-cli MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-beta \ + && pecl install xdebug-2.6.0beta1 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps diff --git a/7.0/Dockerfile-alpine-fpm b/7.0/Dockerfile-alpine-fpm index 7768fb3..cc783e9 100644 --- a/7.0/Dockerfile-alpine-fpm +++ b/7.0/Dockerfile-alpine-fpm @@ -2,7 +2,7 @@ FROM drupaldocker/php:7.0-alpine-fpm MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-beta \ + && pecl install xdebug-2.6.0beta1 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps diff --git a/7.0/Dockerfile-apache b/7.0/Dockerfile-apache index 421e781..363ff1c 100644 --- a/7.0/Dockerfile-apache +++ b/7.0/Dockerfile-apache @@ -1,7 +1,7 @@ FROM drupaldocker/php:7.0-apache MAINTAINER drupal-docker -RUN pecl install xdebug-beta \ +RUN pecl install xdebug-2.6.0beta1 \ && docker-php-ext-enable xdebug COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/Dockerfile-cli b/7.0/Dockerfile-cli index 3849e79..b2cd4f9 100644 --- a/7.0/Dockerfile-cli +++ b/7.0/Dockerfile-cli @@ -1,7 +1,7 @@ FROM drupaldocker/php:7.0-cli MAINTAINER drupal-docker -RUN pecl install xdebug-beta \ +RUN pecl install xdebug-2.6.0beta1 \ && docker-php-ext-enable xdebug COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/Dockerfile-fpm b/7.0/Dockerfile-fpm index 824c395..17bf243 100644 --- a/7.0/Dockerfile-fpm +++ b/7.0/Dockerfile-fpm @@ -1,7 +1,7 @@ FROM drupaldocker/php:7.0-fpm MAINTAINER drupal-docker -RUN pecl install xdebug-beta \ +RUN pecl install xdebug-2.6.0beta1 \ && docker-php-ext-enable xdebug COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-alpine-cli b/7.1/Dockerfile-alpine-cli index c1af46e..c0605a3 100644 --- a/7.1/Dockerfile-alpine-cli +++ b/7.1/Dockerfile-alpine-cli @@ -2,7 +2,7 @@ FROM drupaldocker/php:7.1-alpine-cli MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-beta \ + && pecl install xdebug-2.6.0beta1 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps diff --git a/7.1/Dockerfile-alpine-fpm b/7.1/Dockerfile-alpine-fpm index 350f0b8..63b5ea0 100644 --- a/7.1/Dockerfile-alpine-fpm +++ b/7.1/Dockerfile-alpine-fpm @@ -2,7 +2,7 @@ FROM drupaldocker/php:7.1-alpine-fpm MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-beta \ + && pecl install xdebug-2.6.0beta1 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps diff --git a/7.1/Dockerfile-apache b/7.1/Dockerfile-apache index 8f26ef3..a4356fe 100644 --- a/7.1/Dockerfile-apache +++ b/7.1/Dockerfile-apache @@ -1,7 +1,7 @@ FROM drupaldocker/php:7.1-apache MAINTAINER drupal-docker -RUN pecl install xdebug-beta \ +RUN pecl install xdebug-2.6.0beta1 \ && docker-php-ext-enable xdebug COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-cli b/7.1/Dockerfile-cli index 020b46a..800341d 100644 --- a/7.1/Dockerfile-cli +++ b/7.1/Dockerfile-cli @@ -1,7 +1,7 @@ FROM drupaldocker/php:7.1-cli MAINTAINER drupal-docker -RUN pecl install xdebug-beta \ +RUN pecl install xdebug-2.6.0beta1 \ && docker-php-ext-enable xdebug COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-fpm b/7.1/Dockerfile-fpm index 37d33c2..7300ac4 100644 --- a/7.1/Dockerfile-fpm +++ b/7.1/Dockerfile-fpm @@ -1,7 +1,7 @@ FROM drupaldocker/php:7.1-fpm MAINTAINER drupal-docker -RUN pecl install xdebug-beta \ +RUN pecl install xdebug-2.6.0beta1 \ && docker-php-ext-enable xdebug COPY drupal-*.ini /usr/local/etc/php/conf.d/ From cba37fb87a3f7af3aa676011f8154ca0d7c3f0c7 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 10 Jan 2018 09:32:52 +0100 Subject: [PATCH 17/34] Add PHP 7.2 --- 7.2/Dockerfile-alpine-cli | 9 +++++++++ 7.2/Dockerfile-alpine-fpm | 9 +++++++++ 7.2/Dockerfile-apache | 7 +++++++ 7.2/Dockerfile-cli | 7 +++++++ 7.2/Dockerfile-fpm | 7 +++++++ 7.2/drupal-x-error.ini | 7 +++++++ 7.2/drupal-x-opcache.ini | 1 + 7.2/drupal-xdebug.ini | 8 ++++++++ 8 files changed, 55 insertions(+) create mode 100644 7.2/Dockerfile-alpine-cli create mode 100644 7.2/Dockerfile-alpine-fpm create mode 100644 7.2/Dockerfile-apache create mode 100644 7.2/Dockerfile-cli create mode 100644 7.2/Dockerfile-fpm create mode 100644 7.2/drupal-x-error.ini create mode 100644 7.2/drupal-x-opcache.ini create mode 100644 7.2/drupal-xdebug.ini diff --git a/7.2/Dockerfile-alpine-cli b/7.2/Dockerfile-alpine-cli new file mode 100644 index 0000000..135a3d2 --- /dev/null +++ b/7.2/Dockerfile-alpine-cli @@ -0,0 +1,9 @@ +FROM drupaldocker/php:7.2-alpine-cli +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-alpine-fpm b/7.2/Dockerfile-alpine-fpm new file mode 100644 index 0000000..5bfc5c5 --- /dev/null +++ b/7.2/Dockerfile-alpine-fpm @@ -0,0 +1,9 @@ +FROM drupaldocker/php:7.2-alpine-fpm +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-apache b/7.2/Dockerfile-apache new file mode 100644 index 0000000..3b22c07 --- /dev/null +++ b/7.2/Dockerfile-apache @@ -0,0 +1,7 @@ +FROM drupaldocker/php:7.2-apache +MAINTAINER drupal-docker + +RUN pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-cli b/7.2/Dockerfile-cli new file mode 100644 index 0000000..4b22231 --- /dev/null +++ b/7.2/Dockerfile-cli @@ -0,0 +1,7 @@ +FROM drupaldocker/php:7.2-cli +MAINTAINER drupal-docker + +RUN pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-fpm b/7.2/Dockerfile-fpm new file mode 100644 index 0000000..e148f03 --- /dev/null +++ b/7.2/Dockerfile-fpm @@ -0,0 +1,7 @@ +FROM drupaldocker/php:7.2-fpm +MAINTAINER drupal-docker + +RUN pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/drupal-x-error.ini b/7.2/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/7.2/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/7.2/drupal-x-opcache.ini b/7.2/drupal-x-opcache.ini new file mode 100644 index 0000000..20272f9 --- /dev/null +++ b/7.2/drupal-x-opcache.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=2 diff --git a/7.2/drupal-xdebug.ini b/7.2/drupal-xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/7.2/drupal-xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 From 231cda7967b9c5947feadf18b536b540a3cc1a47 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 10 Jan 2018 10:02:52 +0100 Subject: [PATCH 18/34] Improve documentation --- README.md | 39 ++++++++++++++++++++++----------------- 1 file changed, 22 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index abd4cf7..36b9c63 100644 --- a/README.md +++ b/README.md @@ -3,20 +3,25 @@ PHP-dev for Drupal [![Build Status](https://travis-ci.org/drupal-docker/php.svg?branch=dev)](https://travis-ci.org/drupal-docker/php) [![Docker Pulls](https://img.shields.io/docker/pulls/drupaldocker/php-dev.svg?maxAge=2592000)](https://hub.docker.com/r/drupaldocker/php-dev) -Version | Type | Tags | Dockerfile ---- | --- | --- | --- -5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile) - | | `5.6-alpine-cli`, | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/Dockerfile) - | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/apache/Dockerfile) - | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/fpm/Dockerfile) - | | `5.6-alpine-fpm`,`5.6-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6-alpine/fpm/Dockerfile) -7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile) - | | `7.0-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/Dockerfile) - | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/apache/Dockerfile) - | fpm | `7.0-fpm`, `7.fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/fpm/Dockerfile) - | | `7.0-alpine-fpm`, `7.0-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0-alpine/fpm/Dockerfile) -7.1 | cli | `7.1-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile) - | | `7.1-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1-alpine/Dockerfile) - | apache | `7.1-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/apache/Dockerfile) - | fpm | `7.1-fpm`, `7.1` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/fpm/Dockerfile) - | | `7.1-alpine-fpm`, `7.1-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1-alpine/fpm/Dockerfile) +| Version | Type | Tags | Dockerfile +| --- | --- | --- | --- +| 5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile) +| | | `5.6-alpine-cli`, | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-alpine-cli) +| | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-apache) +| | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-fpm) +| | | `5.6-alpine-fpm`,`5.6-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-alpine-fpm) +| 7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile) +| | | `7.0-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-alpine-cli) +| | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-apache) +| | fpm | `7.0-fpm`, `7-fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-fpm) +| | | `7.0-alpine-fpm`, `7.0-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-alpine-fpm) +| 7.1 | cli | `7.1-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile) +| | | `7.1-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-alpine-cli) +| | apache | `7.1-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-apache) +| | fpm | `7.1-fpm`, `7.1` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-fpm) +| | | `7.1-alpine-fpm`, `7.1-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-alpine-fpm) +| 7.2 | cli | `7.2-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile) +| | | `7.2-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-alpine-cli) +| | apache | `7.2-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-apache) +| | fpm | `7.2-fpm`, `7.2` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-fpm) +| | | `7.2-alpine-fpm`, `7.2-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-alpine-fpm) From 9b928e9d41fcd16b0c20f80ebb85e8301bb0dca4 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 10 Jan 2018 10:05:00 +0100 Subject: [PATCH 19/34] Incorrect link to debian-cli images --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 36b9c63..e4313e2 100644 --- a/README.md +++ b/README.md @@ -5,22 +5,22 @@ PHP-dev for Drupal | Version | Type | Tags | Dockerfile | --- | --- | --- | --- -| 5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile) +| 5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-cli) | | | `5.6-alpine-cli`, | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-alpine-cli) | | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-apache) | | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-fpm) | | | `5.6-alpine-fpm`,`5.6-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-alpine-fpm) -| 7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile) +| 7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-cli) | | | `7.0-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-alpine-cli) | | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-apache) | | fpm | `7.0-fpm`, `7-fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-fpm) | | | `7.0-alpine-fpm`, `7.0-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-alpine-fpm) -| 7.1 | cli | `7.1-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile) +| 7.1 | cli | `7.1-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-cli) | | | `7.1-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-alpine-cli) | | apache | `7.1-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-apache) | | fpm | `7.1-fpm`, `7.1` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-fpm) | | | `7.1-alpine-fpm`, `7.1-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-alpine-fpm) -| 7.2 | cli | `7.2-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile) +| 7.2 | cli | `7.2-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-cli) | | | `7.2-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-alpine-cli) | | apache | `7.2-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-apache) | | fpm | `7.2-fpm`, `7.2` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-fpm) From 4ecd3e31cbf73db339c2e33f0ff3b8fa7d0aef97 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 12 Apr 2018 09:45:59 +0200 Subject: [PATCH 20/34] Restructure the repo for 2.x --- .travis.yml | 11 ++--------- 5.6/Dockerfile-alpine-cli | 9 --------- 5.6/Dockerfile-alpine-fpm | 9 --------- 5.6/Dockerfile-apache | 7 ------- 5.6/Dockerfile-cli | 8 +++++--- 5.6/Dockerfile-fpm | 8 +++++--- 7.0/Dockerfile-alpine-cli | 9 --------- 7.0/Dockerfile-alpine-fpm | 9 --------- 7.0/Dockerfile-apache | 7 ------- 7.0/Dockerfile-cli | 8 +++++--- 7.0/Dockerfile-fpm | 8 +++++--- 7.1/Dockerfile-alpine-cli | 9 --------- 7.1/Dockerfile-alpine-fpm | 9 --------- 7.1/Dockerfile-apache | 7 ------- 7.1/Dockerfile-cli | 8 +++++--- 7.1/Dockerfile-fpm | 8 +++++--- 7.2/Dockerfile-alpine-cli | 9 --------- 7.2/Dockerfile-alpine-fpm | 9 --------- 7.2/Dockerfile-apache | 7 ------- 7.2/Dockerfile-cli | 8 +++++--- 7.2/Dockerfile-fpm | 8 +++++--- 21 files changed, 42 insertions(+), 133 deletions(-) delete mode 100644 5.6/Dockerfile-alpine-cli delete mode 100644 5.6/Dockerfile-alpine-fpm delete mode 100644 5.6/Dockerfile-apache delete mode 100644 7.0/Dockerfile-alpine-cli delete mode 100644 7.0/Dockerfile-alpine-fpm delete mode 100644 7.0/Dockerfile-apache delete mode 100644 7.1/Dockerfile-alpine-cli delete mode 100644 7.1/Dockerfile-alpine-fpm delete mode 100644 7.1/Dockerfile-apache delete mode 100644 7.2/Dockerfile-alpine-cli delete mode 100644 7.2/Dockerfile-alpine-fpm delete mode 100644 7.2/Dockerfile-apache diff --git a/.travis.yml b/.travis.yml index 42ac8e7..0f47e49 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,20 +6,13 @@ services: env: matrix: - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.6" - - DOCKERFILE="Dockerfile-apache" DOCKERPATH="5.6" - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.6" - - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="5.6" - - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="5.6" - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.0" - - DOCKERFILE="Dockerfile-apache" DOCKERPATH="7.0" - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.0" - - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="7.0" - - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="7.0" - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.1" - - DOCKERFILE="Dockerfile-apache" DOCKERPATH="7.1" - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.1" - - DOCKERFILE="Dockerfile-alpine-cli" DOCKERPATH="7.1" - - DOCKERFILE="Dockerfile-alpine-fpm" DOCKERPATH="7.1" + - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.2" + - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.2" before_script: - docker version diff --git a/5.6/Dockerfile-alpine-cli b/5.6/Dockerfile-alpine-cli deleted file mode 100644 index 25c5278..0000000 --- a/5.6/Dockerfile-alpine-cli +++ /dev/null @@ -1,9 +0,0 @@ -FROM drupaldocker/php:5.6-alpine-cli -MAINTAINER drupal-docker - -RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.5.5 \ - && docker-php-ext-enable xdebug \ - && apk del .dd-build-deps - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/Dockerfile-alpine-fpm b/5.6/Dockerfile-alpine-fpm deleted file mode 100644 index da09336..0000000 --- a/5.6/Dockerfile-alpine-fpm +++ /dev/null @@ -1,9 +0,0 @@ -FROM drupaldocker/php:5.6-alpine-fpm -MAINTAINER drupal-docker - -RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.5.5 \ - && docker-php-ext-enable xdebug \ - && apk del .dd-build-deps - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/Dockerfile-apache b/5.6/Dockerfile-apache deleted file mode 100644 index 1c63c24..0000000 --- a/5.6/Dockerfile-apache +++ /dev/null @@ -1,7 +0,0 @@ -FROM drupaldocker/php:5.6-apache -MAINTAINER drupal-docker - -RUN pecl install xdebug-2.5.5 \ - && docker-php-ext-enable xdebug - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/Dockerfile-cli b/5.6/Dockerfile-cli index 3c42779..bf230c9 100644 --- a/5.6/Dockerfile-cli +++ b/5.6/Dockerfile-cli @@ -1,7 +1,9 @@ -FROM drupaldocker/php:5.6-cli +FROM drupaldocker/php:5.6-cli-2.x MAINTAINER drupal-docker -RUN pecl install xdebug-2.5.5 \ - && docker-php-ext-enable xdebug +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.5.5 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.6/Dockerfile-fpm b/5.6/Dockerfile-fpm index cba500e..d3cf46d 100644 --- a/5.6/Dockerfile-fpm +++ b/5.6/Dockerfile-fpm @@ -1,7 +1,9 @@ -FROM drupaldocker/php:5.6-fpm +FROM drupaldocker/php:5.6-fpm-2.x MAINTAINER drupal-docker -RUN pecl install xdebug-2.5.5 \ - && docker-php-ext-enable xdebug +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.5.5 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/Dockerfile-alpine-cli b/7.0/Dockerfile-alpine-cli deleted file mode 100644 index 1efa735..0000000 --- a/7.0/Dockerfile-alpine-cli +++ /dev/null @@ -1,9 +0,0 @@ -FROM drupaldocker/php:7.0-alpine-cli -MAINTAINER drupal-docker - -RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug \ - && apk del .dd-build-deps - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/Dockerfile-alpine-fpm b/7.0/Dockerfile-alpine-fpm deleted file mode 100644 index cc783e9..0000000 --- a/7.0/Dockerfile-alpine-fpm +++ /dev/null @@ -1,9 +0,0 @@ -FROM drupaldocker/php:7.0-alpine-fpm -MAINTAINER drupal-docker - -RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug \ - && apk del .dd-build-deps - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/Dockerfile-apache b/7.0/Dockerfile-apache deleted file mode 100644 index 363ff1c..0000000 --- a/7.0/Dockerfile-apache +++ /dev/null @@ -1,7 +0,0 @@ -FROM drupaldocker/php:7.0-apache -MAINTAINER drupal-docker - -RUN pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/Dockerfile-cli b/7.0/Dockerfile-cli index b2cd4f9..5862dce 100644 --- a/7.0/Dockerfile-cli +++ b/7.0/Dockerfile-cli @@ -1,7 +1,9 @@ -FROM drupaldocker/php:7.0-cli +FROM drupaldocker/php:7.0-cli-2.x MAINTAINER drupal-docker -RUN pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.0/Dockerfile-fpm b/7.0/Dockerfile-fpm index 17bf243..9c6e2a5 100644 --- a/7.0/Dockerfile-fpm +++ b/7.0/Dockerfile-fpm @@ -1,7 +1,9 @@ -FROM drupaldocker/php:7.0-fpm +FROM drupaldocker/php:7.0-fpm-2.x MAINTAINER drupal-docker -RUN pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-alpine-cli b/7.1/Dockerfile-alpine-cli deleted file mode 100644 index c0605a3..0000000 --- a/7.1/Dockerfile-alpine-cli +++ /dev/null @@ -1,9 +0,0 @@ -FROM drupaldocker/php:7.1-alpine-cli -MAINTAINER drupal-docker - -RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug \ - && apk del .dd-build-deps - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-alpine-fpm b/7.1/Dockerfile-alpine-fpm deleted file mode 100644 index 63b5ea0..0000000 --- a/7.1/Dockerfile-alpine-fpm +++ /dev/null @@ -1,9 +0,0 @@ -FROM drupaldocker/php:7.1-alpine-fpm -MAINTAINER drupal-docker - -RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug \ - && apk del .dd-build-deps - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-apache b/7.1/Dockerfile-apache deleted file mode 100644 index a4356fe..0000000 --- a/7.1/Dockerfile-apache +++ /dev/null @@ -1,7 +0,0 @@ -FROM drupaldocker/php:7.1-apache -MAINTAINER drupal-docker - -RUN pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-cli b/7.1/Dockerfile-cli index 800341d..ea4e2b9 100644 --- a/7.1/Dockerfile-cli +++ b/7.1/Dockerfile-cli @@ -1,7 +1,9 @@ -FROM drupaldocker/php:7.1-cli +FROM drupaldocker/php:7.1-cli-2.x MAINTAINER drupal-docker -RUN pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.1/Dockerfile-fpm b/7.1/Dockerfile-fpm index 7300ac4..815a6dc 100644 --- a/7.1/Dockerfile-fpm +++ b/7.1/Dockerfile-fpm @@ -1,7 +1,9 @@ -FROM drupaldocker/php:7.1-fpm +FROM drupaldocker/php:7.1-fpm-2.x MAINTAINER drupal-docker -RUN pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-alpine-cli b/7.2/Dockerfile-alpine-cli deleted file mode 100644 index 135a3d2..0000000 --- a/7.2/Dockerfile-alpine-cli +++ /dev/null @@ -1,9 +0,0 @@ -FROM drupaldocker/php:7.2-alpine-cli -MAINTAINER drupal-docker - -RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug \ - && apk del .dd-build-deps - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-alpine-fpm b/7.2/Dockerfile-alpine-fpm deleted file mode 100644 index 5bfc5c5..0000000 --- a/7.2/Dockerfile-alpine-fpm +++ /dev/null @@ -1,9 +0,0 @@ -FROM drupaldocker/php:7.2-alpine-fpm -MAINTAINER drupal-docker - -RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug \ - && apk del .dd-build-deps - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-apache b/7.2/Dockerfile-apache deleted file mode 100644 index 3b22c07..0000000 --- a/7.2/Dockerfile-apache +++ /dev/null @@ -1,7 +0,0 @@ -FROM drupaldocker/php:7.2-apache -MAINTAINER drupal-docker - -RUN pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-cli b/7.2/Dockerfile-cli index 4b22231..e1b491e 100644 --- a/7.2/Dockerfile-cli +++ b/7.2/Dockerfile-cli @@ -1,7 +1,9 @@ -FROM drupaldocker/php:7.2-cli +FROM drupaldocker/php:7.2-cli-2.x MAINTAINER drupal-docker -RUN pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.2/Dockerfile-fpm b/7.2/Dockerfile-fpm index e148f03..4d83451 100644 --- a/7.2/Dockerfile-fpm +++ b/7.2/Dockerfile-fpm @@ -1,7 +1,9 @@ -FROM drupaldocker/php:7.2-fpm +FROM drupaldocker/php:7.2-fpm-2.x MAINTAINER drupal-docker -RUN pecl install xdebug-2.6.0beta1 \ - && docker-php-ext-enable xdebug +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps COPY drupal-*.ini /usr/local/etc/php/conf.d/ From 83ddab22b7d68000a638d09575bc5e7f2ffcbea2 Mon Sep 17 00:00:00 2001 From: "Eirik S. Morland" Date: Thu, 20 Dec 2018 08:00:02 +0100 Subject: [PATCH 21/34] Add php 7.3 --- .travis.yml | 2 ++ 7.3/Dockerfile-cli | 9 +++++++++ 7.3/Dockerfile-fpm | 9 +++++++++ 7.3/drupal-x-error.ini | 7 +++++++ 7.3/drupal-x-opcache.ini | 1 + 7.3/drupal-xdebug.ini | 8 ++++++++ 6 files changed, 36 insertions(+) create mode 100644 7.3/Dockerfile-cli create mode 100644 7.3/Dockerfile-fpm create mode 100644 7.3/drupal-x-error.ini create mode 100644 7.3/drupal-x-opcache.ini create mode 100644 7.3/drupal-xdebug.ini diff --git a/.travis.yml b/.travis.yml index 0f47e49..0fa17ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ env: - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.1" - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.2" - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.2" + - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.3" + - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.3" before_script: - docker version diff --git a/7.3/Dockerfile-cli b/7.3/Dockerfile-cli new file mode 100644 index 0000000..fbf840b --- /dev/null +++ b/7.3/Dockerfile-cli @@ -0,0 +1,9 @@ +FROM drupaldocker/php:7.3-cli-2.x +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.3/Dockerfile-fpm b/7.3/Dockerfile-fpm new file mode 100644 index 0000000..6567335 --- /dev/null +++ b/7.3/Dockerfile-fpm @@ -0,0 +1,9 @@ +FROM drupaldocker/php:7.3-fpm-2.x +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.6.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.3/drupal-x-error.ini b/7.3/drupal-x-error.ini new file mode 100644 index 0000000..271574c --- /dev/null +++ b/7.3/drupal-x-error.ini @@ -0,0 +1,7 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off +track_errors = On diff --git a/7.3/drupal-x-opcache.ini b/7.3/drupal-x-opcache.ini new file mode 100644 index 0000000..20272f9 --- /dev/null +++ b/7.3/drupal-x-opcache.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=2 diff --git a/7.3/drupal-xdebug.ini b/7.3/drupal-xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/7.3/drupal-xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 From 3608785f30d1543501d544bba80a84b37ee51622 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 9 Jan 2019 09:21:39 +0100 Subject: [PATCH 22/34] Update Dockerfile-fpm --- 7.3/Dockerfile-fpm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.3/Dockerfile-fpm b/7.3/Dockerfile-fpm index 6567335..c771ca1 100644 --- a/7.3/Dockerfile-fpm +++ b/7.3/Dockerfile-fpm @@ -2,7 +2,7 @@ FROM drupaldocker/php:7.3-fpm-2.x MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.6.0beta1 \ + && pecl install xdebug-2.7.0beta1 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps From 788336e0642c2488c950d6c25f94669a9ff6118b Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 9 Jan 2019 09:21:51 +0100 Subject: [PATCH 23/34] Update Dockerfile-cli --- 7.3/Dockerfile-cli | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/7.3/Dockerfile-cli b/7.3/Dockerfile-cli index fbf840b..0efb831 100644 --- a/7.3/Dockerfile-cli +++ b/7.3/Dockerfile-cli @@ -2,7 +2,7 @@ FROM drupaldocker/php:7.3-cli-2.x MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.6.0beta1 \ + && pecl install xdebug-2.7.0beta1 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps From 9878050bf07cd8b5091b5c1f403fe8774c3d07d1 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 9 Jan 2019 10:37:24 +0100 Subject: [PATCH 24/34] Update README.md --- README.md | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index e4313e2..f91a832 100644 --- a/README.md +++ b/README.md @@ -3,25 +3,17 @@ PHP-dev for Drupal [![Build Status](https://travis-ci.org/drupal-docker/php.svg?branch=dev)](https://travis-ci.org/drupal-docker/php) [![Docker Pulls](https://img.shields.io/docker/pulls/drupaldocker/php-dev.svg?maxAge=2592000)](https://hub.docker.com/r/drupaldocker/php-dev) -| Version | Type | Tags | Dockerfile -| --- | --- | --- | --- -| 5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-cli) -| | | `5.6-alpine-cli`, | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-alpine-cli) -| | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-apache) -| | fpm | `5.6-fpm`, `5-fpm`, `5.6`, `5`, `fpm`, `latest` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-fpm) -| | | `5.6-alpine-fpm`,`5.6-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/5.6/Dockerfile-alpine-fpm) -| 7.0 | cli | `7.0-cli`, `7-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-cli) -| | | `7.0-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-alpine-cli) -| | apache | `7.0-apache`, `7-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-apache) -| | fpm | `7.0-fpm`, `7-fpm`, `7.0`, `7` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-fpm) -| | | `7.0-alpine-fpm`, `7.0-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.0/Dockerfile-alpine-fpm) -| 7.1 | cli | `7.1-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-cli) -| | | `7.1-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-alpine-cli) -| | apache | `7.1-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-apache) -| | fpm | `7.1-fpm`, `7.1` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-fpm) -| | | `7.1-alpine-fpm`, `7.1-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.1/Dockerfile-alpine-fpm) -| 7.2 | cli | `7.2-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-cli) -| | | `7.2-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-alpine-cli) -| | apache | `7.2-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-apache) -| | fpm | `7.2-fpm`, `7.2` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-fpm) -| | | `7.2-alpine-fpm`, `7.2-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev/7.2/Dockerfile-alpine-fpm) +| Version | Type | Tags | Dockerfile | +| --- | --- | --- | --- | +| 5.6 | cli | `5.6-cli-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/5.6/Dockerfile-cli) | +| | fpm | `5.6-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/5.6/Dockerfile-fpm) | +| 7.0 | cli | `7.0-cli-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.0/Dockerfile-cli) | +| | fpm | `7.0-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.0/Dockerfile-fpm) | +| 7.1 | cli | `7.1-cli-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.1/Dockerfile-cli) | +| | fpm | `7.1-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.1/Dockerfile-fpm) | +| 7.2 | cli | `7.2-cli-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.2/Dockerfile-cli) | +| | fpm | `7.2-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.2/Dockerfile-fpm) | +| 7.3 | cli | `7.3-cli-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.3/Dockerfile-cli) | +| | fpm | `7.3-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.3/Dockerfile-fpm) | + +Read more: http://www.drupaldocker.org/images/PHP.html From eed4017e1cb5ba2797dd3626401ec6c9de3ffbd2 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 9 Jan 2020 11:56:12 +0100 Subject: [PATCH 25/34] Remove deprecated track_errors --- 7.2/drupal-x-error.ini | 1 - 7.3/drupal-x-error.ini | 1 - 2 files changed, 2 deletions(-) diff --git a/7.2/drupal-x-error.ini b/7.2/drupal-x-error.ini index 271574c..8266612 100644 --- a/7.2/drupal-x-error.ini +++ b/7.2/drupal-x-error.ini @@ -4,4 +4,3 @@ display_startup_errors = On log_errors = On ignore_repeated_errors = Off ignore_repeated_source = Off -track_errors = On diff --git a/7.3/drupal-x-error.ini b/7.3/drupal-x-error.ini index 271574c..8266612 100644 --- a/7.3/drupal-x-error.ini +++ b/7.3/drupal-x-error.ini @@ -4,4 +4,3 @@ display_startup_errors = On log_errors = On ignore_repeated_errors = Off ignore_repeated_source = Off -track_errors = On From dc4bd648ba8f913cee7a794deb1949a89c12903e Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 9 Jan 2020 11:57:17 +0100 Subject: [PATCH 26/34] Add support for php 7.4 --- .travis.yml | 2 ++ 7.4/Dockerfile-cli | 9 +++++++++ 7.4/Dockerfile-fpm | 9 +++++++++ 7.4/drupal-x-error.ini | 6 ++++++ 7.4/drupal-x-opcache.ini | 1 + 7.4/drupal-xdebug.ini | 8 ++++++++ 6 files changed, 35 insertions(+) create mode 100644 7.4/Dockerfile-cli create mode 100644 7.4/Dockerfile-fpm create mode 100644 7.4/drupal-x-error.ini create mode 100644 7.4/drupal-x-opcache.ini create mode 100644 7.4/drupal-xdebug.ini diff --git a/.travis.yml b/.travis.yml index 0fa17ca..c51004c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,6 +15,8 @@ env: - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.2" - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.3" - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.3" + - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.4" + - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.4" before_script: - docker version diff --git a/7.4/Dockerfile-cli b/7.4/Dockerfile-cli new file mode 100644 index 0000000..7911812 --- /dev/null +++ b/7.4/Dockerfile-cli @@ -0,0 +1,9 @@ +FROM drupaldocker/php:7.4-cli-2.x +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.7.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.4/Dockerfile-fpm b/7.4/Dockerfile-fpm new file mode 100644 index 0000000..11b5bf7 --- /dev/null +++ b/7.4/Dockerfile-fpm @@ -0,0 +1,9 @@ +FROM drupaldocker/php:7.4-fpm-2.x +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.7.0beta1 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/7.4/drupal-x-error.ini b/7.4/drupal-x-error.ini new file mode 100644 index 0000000..8266612 --- /dev/null +++ b/7.4/drupal-x-error.ini @@ -0,0 +1,6 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off diff --git a/7.4/drupal-x-opcache.ini b/7.4/drupal-x-opcache.ini new file mode 100644 index 0000000..20272f9 --- /dev/null +++ b/7.4/drupal-x-opcache.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=2 diff --git a/7.4/drupal-xdebug.ini b/7.4/drupal-xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/7.4/drupal-xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 From 277bbc25a3e70e2e2031e76cc6952ce7067a63e8 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 9 Jan 2020 12:03:24 +0100 Subject: [PATCH 27/34] Bump xdebug version --- 7.4/Dockerfile-cli | 2 +- 7.4/Dockerfile-fpm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/7.4/Dockerfile-cli b/7.4/Dockerfile-cli index 7911812..b7c3e21 100644 --- a/7.4/Dockerfile-cli +++ b/7.4/Dockerfile-cli @@ -2,7 +2,7 @@ FROM drupaldocker/php:7.4-cli-2.x MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.7.0beta1 \ + && pecl install xdebug-2.9.0 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps diff --git a/7.4/Dockerfile-fpm b/7.4/Dockerfile-fpm index 11b5bf7..0aa9fb3 100644 --- a/7.4/Dockerfile-fpm +++ b/7.4/Dockerfile-fpm @@ -2,7 +2,7 @@ FROM drupaldocker/php:7.4-fpm-2.x MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.7.0beta1 \ + && pecl install xdebug-2.9.0 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps From a6c4faf56c734f8e40d5b0cf9346b62d0ce29f15 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Thu, 9 Jan 2020 12:09:22 +0100 Subject: [PATCH 28/34] Add PHP 7.4 support to Readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f91a832..e637fac 100644 --- a/README.md +++ b/README.md @@ -15,5 +15,7 @@ PHP-dev for Drupal | | fpm | `7.2-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.2/Dockerfile-fpm) | | 7.3 | cli | `7.3-cli-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.3/Dockerfile-cli) | | | fpm | `7.3-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.3/Dockerfile-fpm) | +| 7.4 | cli | `7.4-cli-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.4/Dockerfile-cli) | +| | fpm | `7.4-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.4/Dockerfile-fpm) | Read more: http://www.drupaldocker.org/images/PHP.html From d1f3c8e555ffcd078731c7a30421bb4b257c723c Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 21 Apr 2021 11:40:32 +0200 Subject: [PATCH 29/34] Replace travis with Github CI --- .github/workflows/build.yml | 44 +++++++++++++++++++++++++++++++++++++ .travis.yml | 29 ------------------------ 2 files changed, 44 insertions(+), 29 deletions(-) create mode 100644 .github/workflows/build.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..052a1ac --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,44 @@ +name: Build and push to registry +on: + schedule: + - cron: '0 7 * * *' + push: + branches: + - dev-2.x + +jobs: + build: + name: Build + runs-on: ubuntu-latest + timeout-minutes: 10 + strategy: + matrix: + image_version: + - "cli" + - "fpm" + php_version: + - "5.6" + - "7.0" + - "7.1" + - "7.2" + - "7.3" + - "7.4" + steps: + - name: Checkout + uses: actions/checkout@v2 + - name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and push + uses: docker/build-push-action@v2 + with: + context: ./${{ matrix.php_version }} + file: ./${{ matrix.php_version }}/Dockerfile-${{ matrix.image_version }} + push: true + tags: drupaldocker/php-dev:${{ matrix.php_version }}-${{ matrix.image_version }}-2.x diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index c51004c..0000000 --- a/.travis.yml +++ /dev/null @@ -1,29 +0,0 @@ -sudo: required - -services: - - docker - -env: - matrix: - - DOCKERFILE="Dockerfile-cli" DOCKERPATH="5.6" - - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="5.6" - - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.0" - - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.0" - - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.1" - - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.1" - - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.2" - - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.2" - - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.3" - - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.3" - - DOCKERFILE="Dockerfile-cli" DOCKERPATH="7.4" - - DOCKERFILE="Dockerfile-fpm" DOCKERPATH="7.4" - -before_script: - - docker version - -script: - - docker build -f ./${DOCKERPATH}/${DOCKERFILE} -t ${DOCKERPATH} ./${DOCKERPATH} - -after_script: - - docker images - - docker run --rm -ti ${DOCKERPATH} php -i From 067e9c209438fcbd2e9c4a3fc508d86d2806043d Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 21 Apr 2021 13:40:02 +0200 Subject: [PATCH 30/34] Test with github actions --- .github/workflows/build.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 052a1ac..91575e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,6 +5,9 @@ on: push: branches: - dev-2.x + pull_request: + branches: + - dev-2.x jobs: build: @@ -35,10 +38,18 @@ jobs: with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Build and push + - name: Build + uses: docker/build-push-action@v2 + with: + context: ./${{ matrix.php_version }} + file: ./${{ matrix.php_version }}/Dockerfile-${{ matrix.image_version }} + push: false + tags: drupaldocker/php:${{ matrix.php_version }}-${{ matrix.image_version }}-2.x + - name: Push uses: docker/build-push-action@v2 with: context: ./${{ matrix.php_version }} file: ./${{ matrix.php_version }}/Dockerfile-${{ matrix.image_version }} push: true - tags: drupaldocker/php-dev:${{ matrix.php_version }}-${{ matrix.image_version }}-2.x + tags: drupaldocker/php:${{ matrix.php_version }}-${{ matrix.image_version }}-2.x + if: ${{ github.event_name == 'push' }} From 61708834c64f651ae6e6cb360fe2d1e659b82d7f Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Wed, 21 Apr 2021 16:03:35 +0200 Subject: [PATCH 31/34] Revert overriding standard images with dev versions --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 91575e3..7792c6e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -44,12 +44,12 @@ jobs: context: ./${{ matrix.php_version }} file: ./${{ matrix.php_version }}/Dockerfile-${{ matrix.image_version }} push: false - tags: drupaldocker/php:${{ matrix.php_version }}-${{ matrix.image_version }}-2.x + tags: drupaldocker/php-dev:${{ matrix.php_version }}-${{ matrix.image_version }}-2.x - name: Push uses: docker/build-push-action@v2 with: context: ./${{ matrix.php_version }} file: ./${{ matrix.php_version }}/Dockerfile-${{ matrix.image_version }} push: true - tags: drupaldocker/php:${{ matrix.php_version }}-${{ matrix.image_version }}-2.x + tags: drupaldocker/php-dev:${{ matrix.php_version }}-${{ matrix.image_version }}-2.x if: ${{ github.event_name == 'push' }} From 6696a35116587118e9f03cea545a4c244dfe2908 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Mon, 10 Apr 2023 22:40:18 +0200 Subject: [PATCH 32/34] Adds php 8 support to php-dev --- .github/workflows/build.yml | 1 + 8.0/Dockerfile-cli | 9 +++++++++ 8.0/Dockerfile-fpm | 9 +++++++++ 8.0/drupal-x-error.ini | 6 ++++++ 8.0/drupal-x-opcache.ini | 1 + 8.0/drupal-xdebug.ini | 8 ++++++++ 6 files changed, 34 insertions(+) create mode 100644 8.0/Dockerfile-cli create mode 100644 8.0/Dockerfile-fpm create mode 100644 8.0/drupal-x-error.ini create mode 100644 8.0/drupal-x-opcache.ini create mode 100644 8.0/drupal-xdebug.ini diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7792c6e..94f2867 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,7 @@ jobs: - "7.2" - "7.3" - "7.4" + - "8.0" steps: - name: Checkout uses: actions/checkout@v2 diff --git a/8.0/Dockerfile-cli b/8.0/Dockerfile-cli new file mode 100644 index 0000000..3adf1e3 --- /dev/null +++ b/8.0/Dockerfile-cli @@ -0,0 +1,9 @@ +FROM drupaldocker/php:8.0-cli-2.x +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.9.0 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/8.0/Dockerfile-fpm b/8.0/Dockerfile-fpm new file mode 100644 index 0000000..0cef92c --- /dev/null +++ b/8.0/Dockerfile-fpm @@ -0,0 +1,9 @@ +FROM drupaldocker/php:8.0-fpm-2.x +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ + && pecl install xdebug-2.9.0 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/8.0/drupal-x-error.ini b/8.0/drupal-x-error.ini new file mode 100644 index 0000000..8266612 --- /dev/null +++ b/8.0/drupal-x-error.ini @@ -0,0 +1,6 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off diff --git a/8.0/drupal-x-opcache.ini b/8.0/drupal-x-opcache.ini new file mode 100644 index 0000000..20272f9 --- /dev/null +++ b/8.0/drupal-x-opcache.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=2 diff --git a/8.0/drupal-xdebug.ini b/8.0/drupal-xdebug.ini new file mode 100644 index 0000000..c4963d5 --- /dev/null +++ b/8.0/drupal-xdebug.ini @@ -0,0 +1,8 @@ +xdebug.remote_port = 9000 +xdebug.remote_enable = 1 +xdebug.remote_connect_back = 1 +xdebug.idekey = "docker" +xdebug.remote_log="/var/log/xdebug/xdebug.log" +xdebug.profiler_enable_trigger = 1 +xdebug.trace_enable_trigger = 1 +xdebug.max_nesting_level = 1000 From 1aefed88e8781fb88c1b1a6f20b69a38d32a8b20 Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Mon, 10 Apr 2023 22:46:01 +0200 Subject: [PATCH 33/34] Use compatible version of xdebug --- 8.0/Dockerfile-cli | 2 +- 8.0/Dockerfile-fpm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/8.0/Dockerfile-cli b/8.0/Dockerfile-cli index 3adf1e3..5a7e8f1 100644 --- a/8.0/Dockerfile-cli +++ b/8.0/Dockerfile-cli @@ -2,7 +2,7 @@ FROM drupaldocker/php:8.0-cli-2.x MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.9.0 \ + && pecl install xdebug-3.2.0 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps diff --git a/8.0/Dockerfile-fpm b/8.0/Dockerfile-fpm index 0cef92c..a6dd71f 100644 --- a/8.0/Dockerfile-fpm +++ b/8.0/Dockerfile-fpm @@ -2,7 +2,7 @@ FROM drupaldocker/php:8.0-fpm-2.x MAINTAINER drupal-docker RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ - && pecl install xdebug-2.9.0 \ + && pecl install xdebug-3.2.0 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps From 3a4b60703f94cd6f4226be7f3950929fe54a220f Mon Sep 17 00:00:00 2001 From: Jakub Piasecki Date: Tue, 11 Apr 2023 09:15:00 +0200 Subject: [PATCH 34/34] Adds 8.1 and 8.2 and fixes xdebug config --- .github/workflows/build.yml | 2 ++ 8.0/Dockerfile-cli | 2 +- 8.0/Dockerfile-fpm | 2 +- 8.0/drupal-xdebug.ini | 11 +++++------ 8.1/Dockerfile-cli | 9 +++++++++ 8.1/Dockerfile-fpm | 9 +++++++++ 8.1/drupal-x-error.ini | 6 ++++++ 8.1/drupal-x-opcache.ini | 1 + 8.1/drupal-xdebug.ini | 7 +++++++ 8.2/Dockerfile-cli | 9 +++++++++ 8.2/Dockerfile-fpm | 9 +++++++++ 8.2/drupal-x-error.ini | 6 ++++++ 8.2/drupal-x-opcache.ini | 1 + 8.2/drupal-xdebug.ini | 7 +++++++ README.md | 6 ++++++ 15 files changed, 79 insertions(+), 8 deletions(-) create mode 100644 8.1/Dockerfile-cli create mode 100644 8.1/Dockerfile-fpm create mode 100644 8.1/drupal-x-error.ini create mode 100644 8.1/drupal-x-opcache.ini create mode 100644 8.1/drupal-xdebug.ini create mode 100644 8.2/Dockerfile-cli create mode 100644 8.2/Dockerfile-fpm create mode 100644 8.2/drupal-x-error.ini create mode 100644 8.2/drupal-x-opcache.ini create mode 100644 8.2/drupal-xdebug.ini diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94f2867..be49b95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,8 @@ jobs: - "7.3" - "7.4" - "8.0" + - "8.1" + - "8.2" steps: - name: Checkout uses: actions/checkout@v2 diff --git a/8.0/Dockerfile-cli b/8.0/Dockerfile-cli index 5a7e8f1..063a6ab 100644 --- a/8.0/Dockerfile-cli +++ b/8.0/Dockerfile-cli @@ -1,7 +1,7 @@ FROM drupaldocker/php:8.0-cli-2.x MAINTAINER drupal-docker -RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ +RUN apk add --no-cache --virtual .dd-build-deps linux-headers $PHPIZE_DEPS \ && pecl install xdebug-3.2.0 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps diff --git a/8.0/Dockerfile-fpm b/8.0/Dockerfile-fpm index a6dd71f..8537f34 100644 --- a/8.0/Dockerfile-fpm +++ b/8.0/Dockerfile-fpm @@ -1,7 +1,7 @@ FROM drupaldocker/php:8.0-fpm-2.x MAINTAINER drupal-docker -RUN apk add --no-cache --virtual .dd-build-deps $PHPIZE_DEPS \ +RUN apk add --no-cache --virtual .dd-build-deps linux-headers $PHPIZE_DEPS \ && pecl install xdebug-3.2.0 \ && docker-php-ext-enable xdebug \ && apk del .dd-build-deps diff --git a/8.0/drupal-xdebug.ini b/8.0/drupal-xdebug.ini index c4963d5..cff46d4 100644 --- a/8.0/drupal-xdebug.ini +++ b/8.0/drupal-xdebug.ini @@ -1,8 +1,7 @@ -xdebug.remote_port = 9000 -xdebug.remote_enable = 1 -xdebug.remote_connect_back = 1 +xdebug.client_port = 9003 +xdebug.start_with_request = trigger +xdebug.mode = debug,profile,trace +xdebug.discover_client_host = true xdebug.idekey = "docker" -xdebug.remote_log="/var/log/xdebug/xdebug.log" -xdebug.profiler_enable_trigger = 1 -xdebug.trace_enable_trigger = 1 +xdebug.log="/var/log/xdebug/xdebug.log" xdebug.max_nesting_level = 1000 diff --git a/8.1/Dockerfile-cli b/8.1/Dockerfile-cli new file mode 100644 index 0000000..00259f7 --- /dev/null +++ b/8.1/Dockerfile-cli @@ -0,0 +1,9 @@ +FROM drupaldocker/php:8.1-cli-2.x +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps linux-headers $PHPIZE_DEPS \ + && pecl install xdebug-3.2.0 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/8.1/Dockerfile-fpm b/8.1/Dockerfile-fpm new file mode 100644 index 0000000..0ab9fe2 --- /dev/null +++ b/8.1/Dockerfile-fpm @@ -0,0 +1,9 @@ +FROM drupaldocker/php:8.1-fpm-2.x +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps linux-headers $PHPIZE_DEPS \ + && pecl install xdebug-3.2.0 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/8.1/drupal-x-error.ini b/8.1/drupal-x-error.ini new file mode 100644 index 0000000..8266612 --- /dev/null +++ b/8.1/drupal-x-error.ini @@ -0,0 +1,6 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off diff --git a/8.1/drupal-x-opcache.ini b/8.1/drupal-x-opcache.ini new file mode 100644 index 0000000..20272f9 --- /dev/null +++ b/8.1/drupal-x-opcache.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=2 diff --git a/8.1/drupal-xdebug.ini b/8.1/drupal-xdebug.ini new file mode 100644 index 0000000..cff46d4 --- /dev/null +++ b/8.1/drupal-xdebug.ini @@ -0,0 +1,7 @@ +xdebug.client_port = 9003 +xdebug.start_with_request = trigger +xdebug.mode = debug,profile,trace +xdebug.discover_client_host = true +xdebug.idekey = "docker" +xdebug.log="/var/log/xdebug/xdebug.log" +xdebug.max_nesting_level = 1000 diff --git a/8.2/Dockerfile-cli b/8.2/Dockerfile-cli new file mode 100644 index 0000000..e3a2804 --- /dev/null +++ b/8.2/Dockerfile-cli @@ -0,0 +1,9 @@ +FROM drupaldocker/php:8.2-cli-2.x +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps linux-headers $PHPIZE_DEPS \ + && pecl install xdebug-3.2.0 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/8.2/Dockerfile-fpm b/8.2/Dockerfile-fpm new file mode 100644 index 0000000..41db723 --- /dev/null +++ b/8.2/Dockerfile-fpm @@ -0,0 +1,9 @@ +FROM drupaldocker/php:8.2-fpm-2.x +MAINTAINER drupal-docker + +RUN apk add --no-cache --virtual .dd-build-deps linux-headers $PHPIZE_DEPS \ + && pecl install xdebug-3.2.0 \ + && docker-php-ext-enable xdebug \ + && apk del .dd-build-deps + +COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/8.2/drupal-x-error.ini b/8.2/drupal-x-error.ini new file mode 100644 index 0000000..8266612 --- /dev/null +++ b/8.2/drupal-x-error.ini @@ -0,0 +1,6 @@ +error_reporting = E_ALL +display_errors = On +display_startup_errors = On +log_errors = On +ignore_repeated_errors = Off +ignore_repeated_source = Off diff --git a/8.2/drupal-x-opcache.ini b/8.2/drupal-x-opcache.ini new file mode 100644 index 0000000..20272f9 --- /dev/null +++ b/8.2/drupal-x-opcache.ini @@ -0,0 +1 @@ +opcache.revalidate_freq=2 diff --git a/8.2/drupal-xdebug.ini b/8.2/drupal-xdebug.ini new file mode 100644 index 0000000..cff46d4 --- /dev/null +++ b/8.2/drupal-xdebug.ini @@ -0,0 +1,7 @@ +xdebug.client_port = 9003 +xdebug.start_with_request = trigger +xdebug.mode = debug,profile,trace +xdebug.discover_client_host = true +xdebug.idekey = "docker" +xdebug.log="/var/log/xdebug/xdebug.log" +xdebug.max_nesting_level = 1000 diff --git a/README.md b/README.md index e637fac..d508c28 100644 --- a/README.md +++ b/README.md @@ -17,5 +17,11 @@ PHP-dev for Drupal | | fpm | `7.3-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.3/Dockerfile-fpm) | | 7.4 | cli | `7.4-cli-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.4/Dockerfile-cli) | | | fpm | `7.4-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/7.4/Dockerfile-fpm) | +| 8.0 | cli | `8.0-cli-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/8.0/Dockerfile-cli) | +| | fpm | `8.0-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/8.0/Dockerfile-fpm) | +| 8.1 | cli | `8.1-cli-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/8.1/Dockerfile-cli) | +| | fpm | `8.1-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/8.1/Dockerfile-fpm) | +| 8.2 | cli | `8.2-cli-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/8.2/Dockerfile-cli) | +| | fpm | `8.2-fpm-2.x` | [Dockerfile](https://github.com/drupal-docker/php/blob/dev-2.x/8.2/Dockerfile-fpm) | Read more: http://www.drupaldocker.org/images/PHP.html