diff --git a/pluie/alpine-apache-fpm/files.tar b/pluie/alpine-apache-fpm/files.tar index c5eb4bc..a484cb4 100644 Binary files a/pluie/alpine-apache-fpm/files.tar and b/pluie/alpine-apache-fpm/files.tar differ diff --git a/pluie/alpine-apache-fpm/install.d/50-fix-apache.sh b/pluie/alpine-apache-fpm/install.d/50-fix-apache.sh index 3c7b970..3aec4c2 100755 --- a/pluie/alpine-apache-fpm/install.d/50-fix-apache.sh +++ b/pluie/alpine-apache-fpm/install.d/50-fix-apache.sh @@ -20,19 +20,12 @@ function a2setModule(){ if [ ! -f /usr/lib/libxml2.so ]; then ln -s /usr/lib/libxml2.so.2 /usr/lib/libxml2.so fi -if [ ! -d /app/$WWW_DIR ]; then - mkdir -p /app/$WWW_DIR -fi if [ ! -d /run/apache2 ]; then mkdir /run/apache2 fi -chown -R 1000:apache /app/$WWW_DIR chmod -R 755 /scripts/pre-init.d mkdir -p /run/apache2 chown apache:apache /run/apache2 -tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g' -sed -i "$tmpsed" /etc/apache2/httpd.conf -sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf initTitle "Apache" "Loading Modules" a2setModule 1 "rewrite" a2setModule 1 "mpm_event" diff --git a/pluie/alpine-apache-fpm/pre-init.d/10-apache.sh b/pluie/alpine-apache-fpm/pre-init.d/10-apache.sh index 1a3b8c2..82f59f7 100755 --- a/pluie/alpine-apache-fpm/pre-init.d/10-apache.sh +++ b/pluie/alpine-apache-fpm/pre-init.d/10-apache.sh @@ -2,6 +2,17 @@ # @app pluie/alpine-apache # @author a-Sansara https://git.pluie.org/pluie/docker-images +if [ ! -d /app/$WWW_DIR ]; then + CREATE_WWW_DIR=1 + mkdir -p /app/$WWW_DIR +fi +if [ ! -f /app/$WWW_DIR/$WWW_INDEX ]; then + echo " /app/$WWW_DIR/$WWW_INDEX +fi +tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g' +sed -i "$tmpsed" /etc/apache2/httpd.conf +sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf + if [ ! -z "$FIX_OWNERSHIP" ] && [ "$FIX_OWNERSHIP" -eq 1 ] && [ -d /app/$WWW_DIR ]; then chown -R 1000:apache /app/$WWW_DIR fi diff --git a/pluie/alpine-apache-fpm/pre-init.d/10-vhost.sh b/pluie/alpine-apache-fpm/pre-init.d/10-vhost.sh index b7184f9..4d74bf1 100755 --- a/pluie/alpine-apache-fpm/pre-init.d/10-vhost.sh +++ b/pluie/alpine-apache-fpm/pre-init.d/10-vhost.sh @@ -6,7 +6,7 @@ if [ ! -z "/app/vhost" ]; then cat < "/app/vhost" ServerName $HTTP_SERVER_NAME - SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 + SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=\$1 SetHandler proxy:fcgi://127.0.0.1:9000 diff --git a/pluie/alpine-apache-php7/files.tar b/pluie/alpine-apache-php7/files.tar index 559c3d7..fa6f04f 100644 Binary files a/pluie/alpine-apache-php7/files.tar and b/pluie/alpine-apache-php7/files.tar differ diff --git a/pluie/alpine-apache-php7/install.d/50-fix-apache.sh b/pluie/alpine-apache-php7/install.d/50-fix-apache.sh index b85c386..60f09ab 100755 --- a/pluie/alpine-apache-php7/install.d/50-fix-apache.sh +++ b/pluie/alpine-apache-php7/install.d/50-fix-apache.sh @@ -22,21 +22,14 @@ fi if [ ! -f /usr/lib/libxml2.so ]; then ln -s /usr/lib/libxml2.so.2 /usr/lib/libxml2.so fi -if [ ! -d /app/$WWW_DIR ]; then - mkdir -p /app/$WWW_DIR -fi + if [ ! -d /run/apache2 ]; then mkdir /run/apache2 fi -chown -R 1000:apache /app/$WWW_DIR chmod -R 755 /scripts/pre-init.d mkdir -p /run/apache2 chown apache:apache /run/apache2 -tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g' -sed -i "$tmpsed" /etc/apache2/httpd.conf -sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf - initTitle "Apache" "Loading Modules" a2setModule 1 "rewrite" a2setModule 1 "mpm_prefork" diff --git a/pluie/alpine-apache-php7/pre-init.d/10-apache.sh b/pluie/alpine-apache-php7/pre-init.d/10-apache.sh index aa532e8..ed914f4 100755 --- a/pluie/alpine-apache-php7/pre-init.d/10-apache.sh +++ b/pluie/alpine-apache-php7/pre-init.d/10-apache.sh @@ -2,6 +2,17 @@ # @app pluie/alpine-apache # @author a-Sansara https://git.pluie.org/pluie/docker-images +if [ ! -d /app/$WWW_DIR ]; then + CREATE_WWW_DIR=1 + mkdir -p /app/$WWW_DIR +fi +if [ ! -f /app/$WWW_DIR/$WWW_INDEX ]; then + echo " /app/$WWW_DIR/$WWW_INDEX +fi +tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g' +sed -i "$tmpsed" /etc/apache2/httpd.conf +sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf + if [ ! -z "$FIX_OWNERSHIP" ] && [ "$FIX_OWNERSHIP" -eq 1 ] && [ -d /app/$WWW_DIR ]; then chown -R 1000:apache /app/$WWW_DIR fi diff --git a/pluie/alpine-apache-php7/pre-init.d/10-vhost.sh b/pluie/alpine-apache-php7/pre-init.d/10-vhost.sh index 4c2481b..df8ed92 100755 --- a/pluie/alpine-apache-php7/pre-init.d/10-vhost.sh +++ b/pluie/alpine-apache-php7/pre-init.d/10-vhost.sh @@ -6,7 +6,7 @@ if [ ! -z "/app/vhost" ]; then cat < "/app/vhost" ServerName $HTTP_SERVER_NAME - SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 + SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=\$1 AllowOverride None Require all granted diff --git a/pluie/alpine-apache/files.tar b/pluie/alpine-apache/files.tar index 1dc4c75..d2b54fd 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/50-fix-apache.sh b/pluie/alpine-apache/install.d/50-fix-apache.sh index 71b35f6..5f7f3ba 100755 --- a/pluie/alpine-apache/install.d/50-fix-apache.sh +++ b/pluie/alpine-apache/install.d/50-fix-apache.sh @@ -19,21 +19,14 @@ function a2setModule(){ if [ ! -f /usr/lib/libxml2.so ]; then ln -s /usr/lib/libxml2.so.2 /usr/lib/libxml2.so fi -if [ ! -d /app/$WWW_DIR ]; then - mkdir -p /app/$WWW_DIR -fi if [ ! -d /run/apache2 ]; then mkdir /run/apache2 fi -chown -R 1000:apache /app/$WWW_DIR + chmod -R 755 /scripts/pre-init.d mkdir -p /run/apache2 chown apache:apache /run/apache2 -tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g' -sed -i "$tmpsed" /etc/apache2/httpd.conf -sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf - initTitle "Apache" "Loading Modules" a2setModule 1 "rewrite" a2setModule 1 "mpm_prefork" diff --git a/pluie/alpine-apache/pre-init.d/10-apache.sh b/pluie/alpine-apache/pre-init.d/10-apache.sh index aa532e8..ed914f4 100755 --- a/pluie/alpine-apache/pre-init.d/10-apache.sh +++ b/pluie/alpine-apache/pre-init.d/10-apache.sh @@ -2,6 +2,17 @@ # @app pluie/alpine-apache # @author a-Sansara https://git.pluie.org/pluie/docker-images +if [ ! -d /app/$WWW_DIR ]; then + CREATE_WWW_DIR=1 + mkdir -p /app/$WWW_DIR +fi +if [ ! -f /app/$WWW_DIR/$WWW_INDEX ]; then + echo " /app/$WWW_DIR/$WWW_INDEX +fi +tmpsed='s#^DocumentRoot ".*#DocumentRoot "/app/'$WWW_DIR'"#g' +sed -i "$tmpsed" /etc/apache2/httpd.conf +sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf + if [ ! -z "$FIX_OWNERSHIP" ] && [ "$FIX_OWNERSHIP" -eq 1 ] && [ -d /app/$WWW_DIR ]; then chown -R 1000:apache /app/$WWW_DIR fi diff --git a/pluie/alpine-apache/pre-init.d/10-vhost.sh b/pluie/alpine-apache/pre-init.d/10-vhost.sh index 4c2481b..df8ed92 100755 --- a/pluie/alpine-apache/pre-init.d/10-vhost.sh +++ b/pluie/alpine-apache/pre-init.d/10-vhost.sh @@ -6,7 +6,7 @@ if [ ! -z "/app/vhost" ]; then cat < "/app/vhost" ServerName $HTTP_SERVER_NAME - SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 + SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=\$1 AllowOverride None Require all granted diff --git a/pluie/alpine-symfony-php7/files.tar b/pluie/alpine-symfony-php7/files.tar index ff9e89c..7687ea4 100644 Binary files a/pluie/alpine-symfony-php7/files.tar and b/pluie/alpine-symfony-php7/files.tar differ diff --git a/pluie/alpine-symfony-php7/pre-init.d/10-symfony.sh b/pluie/alpine-symfony-php7/pre-init.d/10-symfony.sh index c9db74b..8f609ef 100755 --- a/pluie/alpine-symfony-php7/pre-init.d/10-symfony.sh +++ b/pluie/alpine-symfony-php7/pre-init.d/10-symfony.sh @@ -2,7 +2,7 @@ # @app pluie/alpine-symfony # @author a-Sansara https://git.pluie.org/pluie/docker-images -if [ ! -d /app/$WWW_DIR ]; then +if [ -z "$CREATE_WWW_DIR" ]; then cd /tmp mkdir $WWW_DIR symfony new app $SYMFONY_VERSION diff --git a/pluie/alpine-symfony/files.tar b/pluie/alpine-symfony/files.tar index 0858a05..c4301de 100644 Binary files a/pluie/alpine-symfony/files.tar and b/pluie/alpine-symfony/files.tar differ diff --git a/pluie/alpine-symfony/pre-init.d/10-symfony.sh b/pluie/alpine-symfony/pre-init.d/10-symfony.sh index a5e2a4c..ca542ff 100644 --- a/pluie/alpine-symfony/pre-init.d/10-symfony.sh +++ b/pluie/alpine-symfony/pre-init.d/10-symfony.sh @@ -2,7 +2,7 @@ # @app pluie/alpine-symfony # @author a-Sansara https://git.pluie.org/pluie/docker-images -if [ ! -d /app/$WWW_DIR ]; then +if [ -z "$CREATE_WWW_DIR" ]; then cd /tmp ls -la /tmp mkdir $WWW_DIR