diff --git a/pluie/alpine-apache-fpm/files.tar b/pluie/alpine-apache-fpm/files.tar index a484cb4..b0b790d 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-php7/files.tar b/pluie/alpine-apache-php7/files.tar index fa6f04f..df15b39 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/00-repo.sh b/pluie/alpine-apache-php7/install.d/00-repo.sh index 0868a3b..7130f6a 100644 --- a/pluie/alpine-apache-php7/install.d/00-repo.sh +++ b/pluie/alpine-apache-php7/install.d/00-repo.sh @@ -2,7 +2,14 @@ # @app pluie/alpine-apache-php7 # @author a-Sansara https://git.pluie.org/pluie/docker-images -echo "http://dl-cdn.alpinelinux.org/alpine/edge/community -http://dl-cdn.alpinelinux.org/alpine/edge/main -http://dl-cdn.alpinelinux.org/alpine/edge/testing +#~ echo "http://dl-cdn.alpinelinux.org/alpine/edge/community +#~ http://dl-cdn.alpinelinux.org/alpine/edge/main +#~ http://dl-cdn.alpinelinux.org/alpine/edge/testing +#~ echo "http://alpine.gliderlabs.com/alpine/edge/community +#~ http://alpine.gliderlabs.com/alpine/edge/main +#~ http://alpine.gliderlabs.com/alpine/edge/testing +#~ " >> /etc/apk/repositories +echo "http://dl-5.alpinelinux.org/alpine/edge/community +http://dl-5.alpinelinux.org/alpine/edge/main +http://dl-5.alpinelinux.org/alpine/edge/testing " > /etc/apk/repositories diff --git a/pluie/alpine-apache-php7/install.d/10-apache.sh b/pluie/alpine-apache-php7/install.d/10-apache.sh index 6ad18ed..154eec7 100755 --- a/pluie/alpine-apache-php7/install.d/10-apache.sh +++ b/pluie/alpine-apache-php7/install.d/10-apache.sh @@ -2,7 +2,7 @@ # @app pluie/alpine-apache # @author a-Sansara https://git.pluie.org/pluie/docker-images -apk --update add apache2 apache2-proxy \ +apk -U upgrade && apk --update add apache2 apache2-proxy \ php7-apache2 php7-mbstring php7-session php7-phar php7-zlib php7-zip php7-ctype \ php7-mysqli php7-xml php7-pdo_mysql php7-opcache php7-pdo php7-json php7-curl \ php7-gd php7-mcrypt php7-openssl php7-dom \ diff --git a/pluie/alpine-fpm-php7/install.d/00-repo.sh b/pluie/alpine-fpm-php7/install.d/00-repo.sh index 54e953b..b00cbfd 100644 --- a/pluie/alpine-fpm-php7/install.d/00-repo.sh +++ b/pluie/alpine-fpm-php7/install.d/00-repo.sh @@ -2,7 +2,7 @@ # @app pluie/alpine-apache-php7 # @author a-Sansara https://git.pluie.org/pluie/docker-images # -echo "http://dl-cdn.alpinelinux.org/alpine/edge/community -http://dl-cdn.alpinelinux.org/alpine/edge/main -http://dl-cdn.alpinelinux.org/alpine/edge/testing +echo "http://dl-5.alpinelinux.org/alpine/edge/community +http://dl-5.alpinelinux.org/alpine/edge/main +http://dl-5.alpinelinux.org/alpine/edge/testing " > /etc/apk/repositories diff --git a/pluie/alpine-symfony-php7/files.tar b/pluie/alpine-symfony-php7/files.tar index 7687ea4..3c22fcf 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 8f609ef..c39de2f 100755 --- a/pluie/alpine-symfony-php7/pre-init.d/10-symfony.sh +++ b/pluie/alpine-symfony-php7/pre-init.d/10-symfony.sh @@ -2,12 +2,14 @@ # @app pluie/alpine-symfony # @author a-Sansara https://git.pluie.org/pluie/docker-images -if [ -z "$CREATE_WWW_DIR" ]; then +if [ ! -z "$CREATE_WWW_DIR" ]; then cd /tmp - mkdir $WWW_DIR symfony new app $SYMFONY_VERSION - mv app/* /app/ + rm -rf /app/web + mv -f app/* /app/ chown -R 1000:apache /app/ chown -R 1000:apache /app/var chmod -R g+w /app + CTN_IP=$(ip route | cut -d ' ' -f3 | head -n1) + sed -i "/::1/s//::1', '$CTN_IP/" /app/web/app_dev.php fi diff --git a/pluie/alpine-symfony/files.tar b/pluie/alpine-symfony/files.tar index c4301de..76c04b4 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 ca542ff..7c8397f 100644 --- a/pluie/alpine-symfony/pre-init.d/10-symfony.sh +++ b/pluie/alpine-symfony/pre-init.d/10-symfony.sh @@ -2,14 +2,13 @@ # @app pluie/alpine-symfony # @author a-Sansara https://git.pluie.org/pluie/docker-images -if [ -z "$CREATE_WWW_DIR" ]; then +if [ ! -z "$CREATE_WWW_DIR" ]; then cd /tmp - ls -la /tmp - mkdir $WWW_DIR symfony new app $SYMFONY_VERSION - mv app/* /app/ + rm -rf /app/web + mv -f app/* /app/ chown -R 1000:apache /app/ - mkdir -p /app/var/logs - chown -R 1000:apache /app/var - chmod -R g+w /app/ + chmod -R 777 /app/var + CTN_IP=$(ip route | cut -d ' ' -f3 | head -n1) + sed -i "/::1/s//::1', '$CTN_IP/" /app/web/app_dev.php fi