From 1f3df97ea9b2d741a7a20693f6cce40889754bb4 Mon Sep 17 00:00:00 2001 From: Paolo Cuffiani Date: Mon, 9 Nov 2015 15:14:52 +0100 Subject: [PATCH] Enable `mod_rewrite`. --- 5.4/apache/Dockerfile | 5 +++-- 5.4/fpm/Dockerfile | 2 +- 5.5/apache/Dockerfile | 5 +++-- 5.5/fpm/Dockerfile | 2 +- 5.6/apache/Dockerfile | 5 +++-- 5.6/fpm/Dockerfile | 2 +- 7.0/apache/Dockerfile | 5 +++-- 7.0/fpm/Dockerfile | 2 +- Dockerfile | 2 +- Makefile | 7 +++++++ dev/5.4/apache/Dockerfile | 2 +- dev/5.4/fpm/Dockerfile | 2 +- dev/5.5/apache/Dockerfile | 2 +- dev/5.5/fpm/Dockerfile | 2 +- dev/5.6/apache/Dockerfile | 2 +- dev/5.6/fpm/Dockerfile | 2 +- dev/Dockerfile | 2 +- dev/Makefile | 14 ++++++++++++-- 18 files changed, 43 insertions(+), 22 deletions(-) diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile index 47996c9..2333103 100644 --- a/5.4/apache/Dockerfile +++ b/5.4/apache/Dockerfile @@ -1,5 +1,5 @@ FROM php:5.4-apache -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install PHP extensions and PECL modules. RUN buildDeps=" \ @@ -24,4 +24,5 @@ RUN buildDeps=" \ && pecl install memcached redis \ && docker-php-ext-enable memcached.so redis.so \ && apt-get purge -y --auto-remove $buildDeps \ - && rm -r /var/lib/apt/lists/* + && rm -r /var/lib/apt/lists/* \ + && a2enmod rewrite diff --git a/5.4/fpm/Dockerfile b/5.4/fpm/Dockerfile index 0dd9d82..1fc6a6f 100644 --- a/5.4/fpm/Dockerfile +++ b/5.4/fpm/Dockerfile @@ -1,5 +1,5 @@ FROM php:5.4-fpm -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install PHP extensions and PECL modules. RUN buildDeps=" \ diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index 501969b..957db17 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -1,5 +1,5 @@ FROM php:5.5-apache -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install PHP extensions and PECL modules. RUN buildDeps=" \ @@ -24,4 +24,5 @@ RUN buildDeps=" \ && pecl install memcached redis \ && docker-php-ext-enable memcached.so redis.so \ && apt-get purge -y --auto-remove $buildDeps \ - && rm -r /var/lib/apt/lists/* + && rm -r /var/lib/apt/lists/* \ + && a2enmod rewrite diff --git a/5.5/fpm/Dockerfile b/5.5/fpm/Dockerfile index a9c063b..6c38a4a 100644 --- a/5.5/fpm/Dockerfile +++ b/5.5/fpm/Dockerfile @@ -1,5 +1,5 @@ FROM php:5.5-fpm -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install PHP extensions and PECL modules. RUN buildDeps=" \ diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index 182f285..2038a3a 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -1,5 +1,5 @@ FROM php:5.6-apache -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install PHP extensions and PECL modules. RUN buildDeps=" \ @@ -24,4 +24,5 @@ RUN buildDeps=" \ && pecl install memcached redis \ && docker-php-ext-enable memcached.so redis.so \ && apt-get purge -y --auto-remove $buildDeps \ - && rm -r /var/lib/apt/lists/* + && rm -r /var/lib/apt/lists/* \ + && a2enmod rewrite diff --git a/5.6/fpm/Dockerfile b/5.6/fpm/Dockerfile index 42f1d1a..1687f29 100644 --- a/5.6/fpm/Dockerfile +++ b/5.6/fpm/Dockerfile @@ -1,5 +1,5 @@ FROM php:5.6-fpm -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install PHP extensions and PECL modules. RUN buildDeps=" \ diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile index 2fb4966..7d0a58b 100644 --- a/7.0/apache/Dockerfile +++ b/7.0/apache/Dockerfile @@ -1,5 +1,5 @@ FROM php:7.0-apache -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install PHP extensions and PECL modules. RUN buildDeps=" \ @@ -19,4 +19,5 @@ RUN buildDeps=" \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-install gd \ && apt-get purge -y --auto-remove $buildDeps \ - && rm -r /var/lib/apt/lists/* + && rm -r /var/lib/apt/lists/* \ + && a2enmod rewrite diff --git a/7.0/fpm/Dockerfile b/7.0/fpm/Dockerfile index 41a854e..f5b6738 100644 --- a/7.0/fpm/Dockerfile +++ b/7.0/fpm/Dockerfile @@ -1,5 +1,5 @@ FROM php:7.0-fpm -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install PHP extensions and PECL modules. RUN buildDeps=" \ diff --git a/Dockerfile b/Dockerfile index 72161e6..52efcfb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ FROM php:latest -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install PHP extensions and PECL modules. RUN buildDeps=" \ diff --git a/Makefile b/Makefile index 94b5591..2883790 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,13 @@ test: exit 1; \ fi \ done; \ + if [[ $$tag = *'-apache' ]]; then \ + apache=`docker run --rm $(IMAGE):$${tag} apache2ctl -M 2> /dev/null`; \ + if [[ $$apache != *'rewrite_module'* ]]; then \ + echo 'FAIL [mod_rewrite]'; \ + exit 1; \ + fi \ + fi; \ echo 'OK'; \ done diff --git a/dev/5.4/apache/Dockerfile b/dev/5.4/apache/Dockerfile index b723e7e..5b20bd3 100644 --- a/dev/5.4/apache/Dockerfile +++ b/dev/5.4/apache/Dockerfile @@ -1,5 +1,5 @@ FROM chialab/php:5.4-apache -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install XDebug. RUN pecl install xdebug \ diff --git a/dev/5.4/fpm/Dockerfile b/dev/5.4/fpm/Dockerfile index 4c20058..a37c3c8 100644 --- a/dev/5.4/fpm/Dockerfile +++ b/dev/5.4/fpm/Dockerfile @@ -1,5 +1,5 @@ FROM chialab/php:5.4-fpm -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install XDebug. RUN pecl install xdebug \ diff --git a/dev/5.5/apache/Dockerfile b/dev/5.5/apache/Dockerfile index 8ab4ce4..3333034 100644 --- a/dev/5.5/apache/Dockerfile +++ b/dev/5.5/apache/Dockerfile @@ -1,5 +1,5 @@ FROM chialab/php:5.5-apache -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install XDebug. RUN pecl install xdebug \ diff --git a/dev/5.5/fpm/Dockerfile b/dev/5.5/fpm/Dockerfile index 54ae6fc..c8e1fce 100644 --- a/dev/5.5/fpm/Dockerfile +++ b/dev/5.5/fpm/Dockerfile @@ -1,5 +1,5 @@ FROM chialab/php:5.5-fpm -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install XDebug. RUN pecl install xdebug \ diff --git a/dev/5.6/apache/Dockerfile b/dev/5.6/apache/Dockerfile index 46daa22..7c660a9 100644 --- a/dev/5.6/apache/Dockerfile +++ b/dev/5.6/apache/Dockerfile @@ -1,5 +1,5 @@ FROM chialab/php:5.6-apache -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install XDebug. RUN pecl install xdebug \ diff --git a/dev/5.6/fpm/Dockerfile b/dev/5.6/fpm/Dockerfile index 132b304..b1d8090 100644 --- a/dev/5.6/fpm/Dockerfile +++ b/dev/5.6/fpm/Dockerfile @@ -1,5 +1,5 @@ FROM chialab/php:5.6-fpm -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install XDebug. RUN pecl install xdebug \ diff --git a/dev/Dockerfile b/dev/Dockerfile index b49e89e..778efad 100644 --- a/dev/Dockerfile +++ b/dev/Dockerfile @@ -1,5 +1,5 @@ FROM chialab/php:latest -MAINTAINER paolo.cuffiani@chialab.it +MAINTAINER dev@chialab.it # Install XDebug. RUN pecl install xdebug \ diff --git a/dev/Makefile b/dev/Makefile index 29a7f69..797d02f 100644 --- a/dev/Makefile +++ b/dev/Makefile @@ -9,7 +9,9 @@ TAGS = \ 5.5-apache \ 5.5-fpm \ 5.6-apache \ - 5.6-fpm + 5.6-fpm \ + 7.0-apache \ + 7.0-fpm EXTENSIONS = \ bz2 \ calendar \ @@ -34,7 +36,8 @@ pull: docker pull $(PARENT_IMAGE):$${tag}; \ done -build: pull +build: +#build: pull @for tag in $(TAGS); do \ dir=`echo "$${tag}" | sed s:-:/:`; \ if [ $$tag == 'latest' ]; then \ @@ -54,6 +57,13 @@ test: exit 1; \ fi \ done; \ + if [[ $$tag = *'-apache' ]]; then \ + apache=`docker run --rm $(IMAGE):$${tag} apache2ctl -M 2> /dev/null`; \ + if [[ $$apache != *'rewrite_module'* ]]; then \ + echo 'FAIL [mod_rewrite]'; \ + exit 1; \ + fi \ + fi; \ echo 'OK'; \ done