diff --git a/pluie/alpine-apache/README.md b/pluie/alpine-apache/README.md index 0377048..36d481b 100644 --- a/pluie/alpine-apache/README.md +++ b/pluie/alpine-apache/README.md @@ -10,7 +10,7 @@ Extend pluie/alpine with __apache 2.4.23__ and __php 5.6.24__ ## Image Size -- image ~ 37 MB +- image ~ 50 MB ## Image Volumes @@ -37,11 +37,11 @@ by default it use the apache rewrite module to redirect all uri to the unique en chdir to your project directory ``` -$ docker run --name apache -it --link=db1:mysql -v $(pwd):/app pluie/apache +$ docker run --name apache -it --link=mysql:db1 -v $(pwd):/app pluie/alpine-apache ``` or ``` -$ docker run --name srv -it --link=db1:mysql -e HTTP_SERVER_NAME=yourServerName -v $(pwd):/app pluie/apache +$ docker run --name apache -it --link=mysql:db1 -e HTTP_SERVER_NAME=yourServerName -v $(pwd):/app pluie/alpine-apache ``` diff --git a/pluie/alpine-apache/files.tar b/pluie/alpine-apache/files.tar index 2b29c9b..2f78f62 100644 Binary files a/pluie/alpine-apache/files.tar and b/pluie/alpine-apache/files.tar differ diff --git a/pluie/alpine-apache/install.d/10-apache.sh b/pluie/alpine-apache/install.d/10-apache.sh index 68a0f70..4c9b181 100755 --- a/pluie/alpine-apache/install.d/10-apache.sh +++ b/pluie/alpine-apache/install.d/10-apache.sh @@ -2,6 +2,6 @@ # pluie/docker-images - a-Sansara (https://github.com/a-sansara) apk --update add apache2 \ -php5-apache2 php5-cli php5-phar php5-zlib php5-zip php5-ctype php5-mysqli php5-pdo_mysql php5-xml \ -php5-opcache php5-pdo php5-json php5-curl php5-gd php5-mcrypt php5-openssl \ +php5-apache2 php5-cli php5-phar php5-zlib php5-zip php5-ctype php5-mysqli php5-xml php5-pdo_mysql \ +php5-opcache php5-pdo php5-json php5-curl php5-gd php5-mcrypt php5-openssl php5-dom \ # php-pdo_odbc php-soap php-pgsql diff --git a/pluie/alpine-apache/install.d/50-fix-apache.sh b/pluie/alpine-apache/install.d/50-fix-apache.sh index eea85b2..9dc690b 100755 --- a/pluie/alpine-apache/install.d/50-fix-apache.sh +++ b/pluie/alpine-apache/install.d/50-fix-apache.sh @@ -4,8 +4,11 @@ mkdir -p /app/www chown -R 1000:apache /app/www chmod -R 755 /scripts/pre-init.d +mkdir -p /run/apache2 +chown apache:apache /run/apache2 sed -i 's#^DocumentRoot ".*#DocumentRoot "/app/www"#g' /etc/apache2/httpd.conf sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf +sed -i 's#\#LoadModule rewrite_module modules/mod_rewrite.so#LoadModule rewrite_module modules/mod_rewrite.so#' /etc/apache2/httpd.conf sed -ir 's/expose_php = On/expose_php = Off/' /etc/php5/php.ini echo -e "\nIncludeOptional /app/vhost" >> /etc/apache2/httpd.conf rm -f /scripts/pre-init.d/50-example.sh diff --git a/pluie/alpine-apache/pre-init.d/10-vhost.sh b/pluie/alpine-apache/pre-init.d/10-vhost.sh index e338c80..161df18 100755 --- a/pluie/alpine-apache/pre-init.d/10-vhost.sh +++ b/pluie/alpine-apache/pre-init.d/10-vhost.sh @@ -7,7 +7,7 @@ if [ ! -z "/app/vhost" ]; then ServerName $HTTP_SERVER_NAME AllowOverride None - Allow from all + Require all granted DirectoryIndex index.php Options -MultiViews +FollowSymlinks diff --git a/pluie/alpine/files.tar b/pluie/alpine/files.tar index eabbecd..3f3b400 100644 Binary files a/pluie/alpine/files.tar and b/pluie/alpine/files.tar differ diff --git a/pluie/alpine/install.d/20-inputrc.sh b/pluie/alpine/install.d/20-inputrc.sh index 5eb4b97..a56364d 100644 --- a/pluie/alpine/install.d/20-inputrc.sh +++ b/pluie/alpine/install.d/20-inputrc.sh @@ -10,4 +10,3 @@ cat < /etc/inputrc "\e[5~": history-search-backward # page-up "\e[6~": history-search-forward # page-down EOF -bind -f /etc/inputrc