diff --git a/.travis.yml b/.travis.yml index 4391d0c..42ac8e7 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 e2b143b..0000000 --- a/5.4/Dockerfile-apache +++ /dev/null @@ -1,14 +0,0 @@ -FROM php:5.4-apache -MAINTAINER drupal-docker - -VOLUME /var/www/html - -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ - && pecl install redis-2.2.8 \ - && docker-php-ext-enable redis \ - && a2enmod rewrite \ - && rm -rf /var/lib/apt/lists/* - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/Dockerfile-cli b/5.4/Dockerfile-cli deleted file mode 100644 index 60c47a8..0000000 --- a/5.4/Dockerfile-cli +++ /dev/null @@ -1,18 +0,0 @@ -FROM php:5.4-cli -MAINTAINER drupal-docker - -VOLUME /var/www/html -WORKDIR /var/www/html - -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo git \ - && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ - && pecl install redis-2.2.8 \ - && 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 cli/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 763810d..0000000 --- a/5.4/Dockerfile-fpm +++ /dev/null @@ -1,13 +0,0 @@ -FROM php:5.4-fpm -MAINTAINER drupal-docker - -VOLUME /var/www/html - -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ - && pecl install redis-2.2.8 \ - && docker-php-ext-enable redis \ - && rm -rf /var/lib/apt/lists/* - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.4/cli/drupal-cli.ini b/5.4/cli/drupal-cli.ini deleted file mode 100644 index 588ab91..0000000 --- a/5.4/cli/drupal-cli.ini +++ /dev/null @@ -1,3 +0,0 @@ -allow_url_fopen = On -display_errors = On -memory_limit = -1 diff --git a/5.4/drupal-00.ini b/5.4/drupal-00.ini deleted file mode 100644 index 9a11209..0000000 --- a/5.4/drupal-00.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 -date.timezone = "UTC" diff --git a/5.5/Dockerfile-apache b/5.5/Dockerfile-apache deleted file mode 100644 index 7492063..0000000 --- a/5.5/Dockerfile-apache +++ /dev/null @@ -1,15 +0,0 @@ -FROM php:5.5-apache -MAINTAINER drupal-docker - -VOLUME /var/www/html - -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ - && docker-php-ext-install opcache \ - && pecl install redis-2.2.8 \ - && docker-php-ext-enable redis \ - && a2enmod rewrite \ - && rm -rf /var/lib/apt/lists/* - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/Dockerfile-cli b/5.5/Dockerfile-cli deleted file mode 100644 index 3bfaf65..0000000 --- a/5.5/Dockerfile-cli +++ /dev/null @@ -1,19 +0,0 @@ -FROM php:5.5-cli -MAINTAINER drupal-docker - -VOLUME /var/www/html -WORKDIR /var/www/html - -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev sudo git \ - && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ - && docker-php-ext-install opcache \ - && pecl install redis-2.2.8 \ - && 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 cli/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 5d58b28..0000000 --- a/5.5/Dockerfile-fpm +++ /dev/null @@ -1,14 +0,0 @@ -FROM php:5.5-fpm -MAINTAINER drupal-docker - -VOLUME /var/www/html - -RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \ - && docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \ - && docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip \ - && docker-php-ext-install opcache \ - && pecl install redis-2.2.8 \ - && docker-php-ext-enable redis \ - && rm -rf /var/lib/apt/lists/* - -COPY drupal-*.ini /usr/local/etc/php/conf.d/ diff --git a/5.5/cli/drupal-cli.ini b/5.5/cli/drupal-cli.ini deleted file mode 100644 index 588ab91..0000000 --- a/5.5/cli/drupal-cli.ini +++ /dev/null @@ -1,3 +0,0 @@ -allow_url_fopen = On -display_errors = On -memory_limit = -1 diff --git a/5.5/drupal-00.ini b/5.5/drupal-00.ini deleted file mode 100644 index 9a11209..0000000 --- a/5.5/drupal-00.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 -date.timezone = "UTC" diff --git a/5.5/drupal-opcache.ini b/5.5/drupal-opcache.ini deleted file mode 100644 index 7964455..0000000 --- a/5.5/drupal-opcache.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/README.md b/README.md index f2cc9ad..cf5964a 100644 --- a/README.md +++ b/README.md @@ -5,12 +5,6 @@ PHP Version | Type | Tags | Dockerfile --- | --- | --- | --- -5.4 (deprecated) | cli | `5.4-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.4/Dockerfile-cli) - | apache | `5.4-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.4/Dockerfile-apache) - | fpm | `5.4-fpm`, `5.4` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.4/Dockerfile-fpm) -5.5 (deprecated) | cli | `5.5-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.5/Dockerfile-cli) - | apache | `5.5-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.5/Dockerfile-apache) - | fpm | `5.5-fpm`, `5.5` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.5/Dockerfile-fpm) 5.6 | cli | `5.6-cli`, `5-cli`, `cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/Dockerfile-cli) | | `5.6-alpine-cli` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/Dockerfile-alpine-cli) | apache | `5.6-apache`, `5-apache`, `apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/5.6/Dockerfile-apache) @@ -26,5 +20,3 @@ Version | Type | Tags | Dockerfile | apache | `7.1-apache` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/Dockerfile-apache) | fpm | `7.1-fpm`, `7.1` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/Dockerfile-fpm) | | `7.1-alpine-fpm`, `7.1-alpine` | [Dockerfile](https://github.com/drupal-docker/php/blob/master/7.1/Dockerfile-alpine-fpm) - -**Deprecation notice:** drupaldocker/php:5.4 and drupaldocker/php:5.5 EOL date: **December 13, 2016**