From b92bff465d807750cf4d562bd168a753540485c4 Mon Sep 17 00:00:00 2001 From: a-sansara Date: Sun, 29 Jan 2017 23:44:52 +0100 Subject: [PATCH] adding pluie/alpine-apache-php7 --- DOCKER.md | 2 + README.md | 2 + pluie/alpine-apache-fpm/Dockerfile | 2 +- pluie/alpine-apache-fpm/README.md | 13 ++- pluie/alpine-apache-fpm/files.tar | Bin 10240 -> 10240 bytes pluie/alpine-apache-php7/.gitignore | 1 + pluie/alpine-apache-php7/Dockerfile | 20 ++++ pluie/alpine-apache-php7/README.md | 94 ++++++++++++++++++ pluie/alpine-apache-php7/build | 22 ++++ pluie/alpine-apache-php7/install.d/00-repo.sh | 8 ++ .../alpine-apache-php7/install.d/10-apache.sh | 9 ++ .../install.d/50-fix-apache.sh | 53 ++++++++++ pluie/alpine-apache-php7/main.sh | 8 ++ .../pre-init.d/10-apache.sh | 11 ++ .../alpine-apache-php7/pre-init.d/10-vhost.sh | 24 +++++ pluie/alpine-apache/Dockerfile | 2 +- pluie/alpine-apache/README.md | 12 ++- pluie/alpine-apache/files.tar | Bin 10240 -> 10240 bytes pluie/alpine-mysql/README.md | 3 +- pluie/alpine-mysql/files.tar | Bin 20480 -> 20480 bytes pluie/alpine-symfony/README.md | 8 +- pluie/alpine-symfony/files.tar | Bin 10240 -> 10240 bytes pluie/alpine-symfony/pre-init.d/10-symfony.sh | 2 +- pluie/alpine/README.md | 2 + pluie/alpine/files.tar | Bin 20480 -> 20480 bytes 25 files changed, 284 insertions(+), 14 deletions(-) create mode 100644 pluie/alpine-apache-php7/.gitignore create mode 100644 pluie/alpine-apache-php7/Dockerfile create mode 100644 pluie/alpine-apache-php7/README.md create mode 100755 pluie/alpine-apache-php7/build create mode 100644 pluie/alpine-apache-php7/install.d/00-repo.sh create mode 100755 pluie/alpine-apache-php7/install.d/10-apache.sh create mode 100755 pluie/alpine-apache-php7/install.d/50-fix-apache.sh create mode 100755 pluie/alpine-apache-php7/main.sh create mode 100755 pluie/alpine-apache-php7/pre-init.d/10-apache.sh create mode 100755 pluie/alpine-apache-php7/pre-init.d/10-vhost.sh diff --git a/DOCKER.md b/DOCKER.md index 623b253..1414ad2 100644 --- a/DOCKER.md +++ b/DOCKER.md @@ -5,6 +5,7 @@ - [pluie/alpine-apache][3] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 - [pluie/alpine-apache-fpm][7] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 Fpm - [pluie/alpine-symfony][6] ( ~ 82 MB ) Symfony2.8 or 3.1 + - [pluie/alpine-apache-php7][8] ( ~ 50 MB ) Apache/2.4.25 Php/7.0.15 - [pluie/alpine-mysql][4] ( ~172 MB ) MariaDb/10.1.14 - [docker tips][5] @@ -162,3 +163,4 @@ docker run --name symfony --restart=always \ [7]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-apache-fpm [5]: https://github.com/pluie-org/docker-images/blob/master/DOCKER.md [6]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-symfony + [8]: https://github.com/pluie-org/docker-images/tree/master/pluie/7alpine-php diff --git a/README.md b/README.md index 653e108..ca81ed8 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ various based images for Docker - [pluie/alpine-apache][3] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 - [pluie/alpine-apache-fpm][7] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 Fpm - [pluie/alpine-symfony][6] ( ~ 82 MB ) Symfony2.8 or 3.1 + - [pluie/alpine-apache-php7][8] ( ~ 50 MB ) Apache/2.4.25 Php/7.0.15 - [pluie/alpine-mysql][4] ( ~172 MB ) MariaDb/10.1.14 - [docker tips][5] @@ -79,3 +80,4 @@ you can keep same __build__ script in any project [7]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-apache-fpm [5]: https://github.com/pluie-org/docker-images/blob/master/DOCKER.md [6]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-symfony + [8]: https://github.com/pluie-org/docker-images/tree/master/pluie/7alpine-php diff --git a/pluie/alpine-apache-fpm/Dockerfile b/pluie/alpine-apache-fpm/Dockerfile index 27778ea..9922e5c 100644 --- a/pluie/alpine-apache-fpm/Dockerfile +++ b/pluie/alpine-apache-fpm/Dockerfile @@ -13,7 +13,7 @@ ENV SHENV_NAME=ApacheFpm \ WWW_DIR=www \ WWW_INDEX=index.php \ FIX_OWNERSHIP=1 \ - TZ=Europe/Paris + TZ=Europe/Paris EXPOSE 80 diff --git a/pluie/alpine-apache-fpm/README.md b/pluie/alpine-apache-fpm/README.md index 041ea54..3c5dc8d 100644 --- a/pluie/alpine-apache-fpm/README.md +++ b/pluie/alpine-apache-fpm/README.md @@ -5,6 +5,7 @@ - [pluie/alpine-apache][3] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 - [pluie/alpine-apache-fpm][7] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 Fpm - [pluie/alpine-symfony][6] ( ~ 82 MB ) Symfony2.8 or 3.1 + - [pluie/alpine-apache-php7][8] ( ~ 50 MB ) Apache/2.4.25 Php/7.0.15 - [pluie/alpine-mysql][4] ( ~172 MB ) MariaDb/10.1.14 - [docker tips][5] @@ -20,7 +21,7 @@ Extend pluie/alpine with __apache 2.4.23__ and __php 5.6.24__ with FPM ## ENV variables ``` - HTTP_SERVER_NAME=apache.docker # apache ServerName + HTTP_SERVER_NAME=fpm.docker # apache ServerName WWW_DIR=www # DocumentRoot relative to volume WWW_INDEX=index.php # DirectoryIndex FIX_OWNERSHIP=1 # @@ -30,7 +31,7 @@ Extend pluie/alpine with __apache 2.4.23__ and __php 5.6.24__ with FPM ``` SHENV_CTX=LOCAL # LOCAL|INT|PROD change context bg color - SHENV_NAME=Apache # container name + SHENV_NAME=ApacheFpm # container name SHENV_COLOR=67 # ANSI EXTENDED COLOR CODE TZ=Europe/Paris # TIMEZONE ``` @@ -66,17 +67,20 @@ by default it use the apache rewrite module to redirect all uri to entry point $ chdir to your project directory ``` -$ docker run --name afpm -it --link=mysql:db1 -v $(pwd):/app pluie/alpine-apache-fpm +$ docker run --name afpm -it --link=mysql:db -v $(pwd):/app pluie/alpine-apache-fpm ``` or ``` -$ docker run --name afpm -d --link=mysql:db1 -e HTTP_SERVER_NAME=yourServerName -v $(pwd):/app pluie/alpine-apache-fpm +$ docker run --name afpm -d --link=mysql:db -e HTTP_SERVER_NAME=yourServerName -v $(pwd):/app pluie/alpine-apache-fpm ``` ## Controling http server ``` +# reload +$ docker exec -it afpm "httpd -k graceful" +# restart $ docker exec -it afpm "httpd -k restart" ``` for more commands : @@ -91,3 +95,4 @@ $ docker exec -it afpm "httpd -h" [7]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-apache-fpm [5]: https://github.com/pluie-org/docker-images/blob/master/DOCKER.md [6]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-symfony + [8]: https://github.com/pluie-org/docker-images/tree/master/pluie/7alpine-php diff --git a/pluie/alpine-apache-fpm/files.tar b/pluie/alpine-apache-fpm/files.tar index cec39a303818a0a61d37746ce428ef908a395feb..c5eb4bc240cea1e0fbe9848e4bf0c0bcc2719d08 100644 GIT binary patch delta 226 zcmZn&Xb70lDPnA3Xl!6=YHDD_U|?uuW^BTsU@+N{F=aC&V+S*;tg*3?A%lV`M3$A8 zaWWrIHL40zVO@XnI3D5+n9fBQo|Lp9~7z}SoRyg%QSvxz-<3}e+~5qM~X4| diff --git a/pluie/alpine-apache-php7/.gitignore b/pluie/alpine-apache-php7/.gitignore new file mode 100644 index 0000000..ee50cfe --- /dev/null +++ b/pluie/alpine-apache-php7/.gitignore @@ -0,0 +1 @@ +files.tar diff --git a/pluie/alpine-apache-php7/Dockerfile b/pluie/alpine-apache-php7/Dockerfile new file mode 100644 index 0000000..ea1aa8b --- /dev/null +++ b/pluie/alpine-apache-php7/Dockerfile @@ -0,0 +1,20 @@ +# @app pluie/alpine-apache +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +FROM pluie/alpine + +MAINTAINER a-Sansara https://github.com/a-sansara + +ADD files.tar /scripts + +ENV SHENV_NAME=Php7 \ + SHENV_COLOR=67 \ + HTTP_SERVER_NAME=test.docker \ + WWW_DIR=www \ + WWW_INDEX=index.php \ + FIX_OWNERSHIP=1 \ + TZ=Europe/Paris + +EXPOSE 80 + +RUN bash /scripts/install.sh diff --git a/pluie/alpine-apache-php7/README.md b/pluie/alpine-apache-php7/README.md new file mode 100644 index 0000000..dd66735 --- /dev/null +++ b/pluie/alpine-apache-php7/README.md @@ -0,0 +1,94 @@ +# pluie/alpine-apache + +- [index][1] +- [pluie/alpine][2] ( < 10 MB ) Alpine/3.4 + - [pluie/alpine-apache][3] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 + - [pluie/alpine-apache-fpm][7] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 Fpm + - [pluie/alpine-symfony][6] ( ~ 82 MB ) Symfony2.8 or 3.0 + - [pluie/alpine-apache-php7][8] ( ~ 50 MB ) Apache/2.4.25 Php/7.0.15 + - [pluie/alpine-mysql][4] ( ~172 MB ) Mysql/5.5.47 ( MariaDB ) +- [docker tips][5] + +Extend pluie/alpine with __apache 2.4.25__ and __php 7.0.15__ + +- error log are attached to stdout +- no need port redirection +- you can use env var at container creation : __HTTP_SERVER_NAME__ (default : site.docker ortherwise edit /app/vhost later) +- you can still use ever your local http & sql server while your container(s) are running + + +## Image Size + +- image ~ 82 MB + +## ENV variables + +``` + HTTP_SERVER_NAME=site.docker # apache ServerName + WWW_DIR=www # DocumentRoot relative to volume + WWW_INDEX=index.php # DirectoryIndex + FIX_OWNERSHIP=1 # +``` + +### Inherit ENV variables + +``` + SHENV_CTX=LOCAL # LOCAL|INT|PROD change context bg color + SHENV_NAME=Php7 # container name + SHENV_COLOR=67 # ANSI EXTENDED COLOR CODE + TZ=Europe/Paris # TIMEZONE +``` + +## Image Volumes + +__/app__ directory is a docker volume bind to your app project (silex/symfony etc) + +__/app/$WWW_DIR__ is the documentRoot. +put only your entry point and static files to the documentRoot directory, no your app sources +(__/app__ directory is design for this). + +__/app/vhost__ is your app vhost configuration file (with a serverName directive). +by default it use the apache rewrite module to redirect all uri to entry point $WWW_INDEX + +``` +/app/ # your application directory + | + |---- $WWW_DIR/ # documentRoot + | + |---- vhost # apache app vhost +``` + + +## Image Usage + +chdir to your project directory +``` +$ docker run --name php7 -it --link=mysql:db -v $(pwd):/app pluie/alpine-apache +``` +or +``` +$ docker run --name php7 -it --link=mysql:db -e HTTP_SERVER_NAME=yourServerName -v $(pwd):/app pluie/alpine-apache-php7 +``` + + +## Controling http server + +``` +# reload +$ docker exec -it php7 "httpd -k graceful" +# restart +$ docker exec -it php7 "httpd -k restart" +``` +for more commands : +``` +$ docker exec -it php7 "httpd -h" +``` + + [1]: https://github.com/pluie-org/docker-images + [2]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine + [3]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-apache + [4]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-mysql + [7]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-apache-fpm + [5]: https://github.com/pluie-org/docker-images/blob/master/DOCKER.md + [6]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-symfony + [8]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-apache-php7 diff --git a/pluie/alpine-apache-php7/build b/pluie/alpine-apache-php7/build new file mode 100755 index 0000000..09b3da8 --- /dev/null +++ b/pluie/alpine-apache-php7/build @@ -0,0 +1,22 @@ +#!/bin/bash +# @app pluie/alpine-apache +# @author a-Sansara https://git.pluie.org/pluie/docker-images + + Ctitle="\033[1;38;5;15;1;48;5;30m" + Citem="\033[1;38;5;36m" + Coff="\033[m" + DOCKDIR=$(dirname "$(readlink -f ${BASH_SOURCE[0]})") +DOCKBUILD=$(basename $DOCKDIR) + DOCKREPO=$(basename $(dirname $DOCKDIR)) + DOCKTAG=${1:-"latest"} + TMPPWD=$(pwd) + indent=" " +cd $DOCKDIR +echo -e "\n ${Ctitle} Preparing files : ${Coff}${Citem}\n" + +tar -cvf files.tar *.sh pre-init.d/ install.d/ | sed "s/^/${indent}↠ /" + +echo -e "\n ${Ctitle} Proceed Dockerfile build : ${Coff}\n +" +docker build --force-rm -t ${DOCKREPO}/${DOCKBUILD}:${DOCKTAG} . | sed "s/^/${indent}/" +cd $TMPPWD diff --git a/pluie/alpine-apache-php7/install.d/00-repo.sh b/pluie/alpine-apache-php7/install.d/00-repo.sh new file mode 100644 index 0000000..0868a3b --- /dev/null +++ b/pluie/alpine-apache-php7/install.d/00-repo.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# @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 +" > /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 new file mode 100755 index 0000000..cb0c278 --- /dev/null +++ b/pluie/alpine-apache-php7/install.d/10-apache.sh @@ -0,0 +1,9 @@ +#!/bin/bash +# @app pluie/alpine-apache +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +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 \ +# php-pdo_odbc php-soap php-pgsql diff --git a/pluie/alpine-apache-php7/install.d/50-fix-apache.sh b/pluie/alpine-apache-php7/install.d/50-fix-apache.sh new file mode 100755 index 0000000..59afa2e --- /dev/null +++ b/pluie/alpine-apache-php7/install.d/50-fix-apache.sh @@ -0,0 +1,53 @@ +#!/bin/bash +# @app pluie/alpine-apache +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +function a2setModule(){ + local enable=${1:-''} + local path=${3:-'/etc/apache2/httpd.conf'} + local scom='' + local rcom='\#' + if [ ! -z $1 ] && [ ! -z "$2" ]; then + if [ "$enable" = 1 ]; then + scom='\#' + rcom='' + fi + echo "$2" + sed -i "s#${scom}LoadModule $2_module modules/mod_$2.so#${rcom}LoadModule $2_module modules/mod_$2.so#" "$path" + fi +} +if [ ! -f /usr/lib/php ]; then + ln -s /usr/lib/php7 /usr/lib/php +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" +a2setModule 1 "slotmem_shm" +a2setModule 1 "heartmonitor" +#~ a2setModule 1 "watchdog" +initTitle "Apache" "Removing Modules" +a2setModule 0 "mpm_event" +a2setModule 0 "proxy_fdpass" /etc/apache2/conf.d/proxy.conf + +sed -i "s|;*date.timezone =.*|date.timezone = ${TZ}|i" /etc/php7/php.ini +sed -ir 's/expose_php = On/expose_php = Off/' /etc/php7/php.ini +echo -e "\nIncludeOptional /app/vhost" >> /etc/apache2/httpd.conf +unset tmpsed diff --git a/pluie/alpine-apache-php7/main.sh b/pluie/alpine-apache-php7/main.sh new file mode 100755 index 0000000..b8afa9a --- /dev/null +++ b/pluie/alpine-apache-php7/main.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# @app pluie/alpine-apache +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +. /scripts/common.sh + +initTitle "Starting" "Apache Daemon" +httpd -D FOREGROUND diff --git a/pluie/alpine-apache-php7/pre-init.d/10-apache.sh b/pluie/alpine-apache-php7/pre-init.d/10-apache.sh new file mode 100755 index 0000000..aa532e8 --- /dev/null +++ b/pluie/alpine-apache-php7/pre-init.d/10-apache.sh @@ -0,0 +1,11 @@ +#!/usr/bin/bash +# @app pluie/alpine-apache +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +if [ ! -z "$FIX_OWNERSHIP" ] && [ "$FIX_OWNERSHIP" -eq 1 ] && [ -d /app/$WWW_DIR ]; then + chown -R 1000:apache /app/$WWW_DIR +fi + +touch /var/log/apache2/error.log + +tail -F /var/log/apache2/error.log & diff --git a/pluie/alpine-apache-php7/pre-init.d/10-vhost.sh b/pluie/alpine-apache-php7/pre-init.d/10-vhost.sh new file mode 100755 index 0000000..4c2481b --- /dev/null +++ b/pluie/alpine-apache-php7/pre-init.d/10-vhost.sh @@ -0,0 +1,24 @@ +#!/usr/bin/bash +# @app pluie/alpine-apache +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +if [ ! -z "/app/vhost" ]; then + cat < "/app/vhost" + + ServerName $HTTP_SERVER_NAME + SetEnvIfNoCase ^Authorization$ "(.+)" HTTP_AUTHORIZATION=$1 + + AllowOverride None + Require all granted + DirectoryIndex $WWW_INDEX + + Options -MultiViews +FollowSymlinks + RewriteEngine On + RewriteCond %{REQUEST_FILENAME} !-f + RewriteRule ^ $WWW_INDEX [QSA,L] + + + +# IncludeOptional /app/vhost2 +EOF +fi diff --git a/pluie/alpine-apache/Dockerfile b/pluie/alpine-apache/Dockerfile index b5c02e9..4c8e8a8 100644 --- a/pluie/alpine-apache/Dockerfile +++ b/pluie/alpine-apache/Dockerfile @@ -13,7 +13,7 @@ ENV SHENV_NAME=Apache \ WWW_DIR=www \ WWW_INDEX=index.php \ FIX_OWNERSHIP=1 \ - TZ=Europe/Paris + TZ=Europe/Paris EXPOSE 80 diff --git a/pluie/alpine-apache/README.md b/pluie/alpine-apache/README.md index ca8636b..2f58cb7 100644 --- a/pluie/alpine-apache/README.md +++ b/pluie/alpine-apache/README.md @@ -5,6 +5,7 @@ - [pluie/alpine-apache][3] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 - [pluie/alpine-apache-fpm][7] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 Fpm - [pluie/alpine-symfony][6] ( ~ 82 MB ) Symfony2.8 or 3.0 + - [pluie/alpine-apache-php7][8] ( ~ 50 MB ) Apache/2.4.25 Php/7.0.15 - [pluie/alpine-mysql][4] ( ~172 MB ) Mysql/5.5.47 ( MariaDB ) - [docker tips][5] @@ -12,7 +13,7 @@ Extend pluie/alpine with __apache 2.4.23__ and __php 5.6.24__ - error log are attached to stdout - no need port redirection -- you can use env var at container creation : __HTTP_SERVER_NAME__ (default : docker-site.dev ortherwise edit app/vhost later) +- you can use env var at container creation : __HTTP_SERVER_NAME__ (default : apache.docker ortherwise edit app/vhost later) - you can still use ever your local http & sql server while your container(s) are running @@ -62,23 +63,27 @@ by default it use the apache rewrite module to redirect all uri to entry point $ chdir to your project directory ``` -$ docker run --name apache -it --link=mysql:db1 -v $(pwd):/app pluie/alpine-apache +$ docker run --name apache -it --link=mysql:db -v $(pwd):/app pluie/alpine-apache ``` or ``` -$ docker run --name apache -it --link=mysql:db1 -e HTTP_SERVER_NAME=yourServerName -v $(pwd):/app pluie/alpine-apache +$ docker run --name apache -it --link=mysql:db -e HTTP_SERVER_NAME=yourServerName -v $(pwd):/app pluie/alpine-apache ``` ## Controling http server ``` +# reload +$ docker exec -it apache "httpd -k graceful" +# restart $ docker exec -it apache "httpd -k restart" ``` for more commands : ``` $ docker exec -it apache "httpd -h" ``` + [1]: https://github.com/pluie-org/docker-images [2]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine [3]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-apache @@ -86,3 +91,4 @@ $ docker exec -it apache "httpd -h" [7]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-apache-fpm [5]: https://github.com/pluie-org/docker-images/blob/master/DOCKER.md [6]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-symfony + [8]: https://github.com/pluie-org/docker-images/tree/master/pluie/7alpine-php diff --git a/pluie/alpine-apache/files.tar b/pluie/alpine-apache/files.tar index 73ce6319b91623a0370bcbbc7a456ecc55a943f5..1dc4c75b1dbc3bfce8b70fb9b67a1df1e884fddc 100644 GIT binary patch delta 226 zcmZn&Xb70lDPnA3Xl!6=YHDD_U|?uuW^BfwU@+N{F=aC&V+S*;tg*3?A%lV`M3$A8 zaWWrIHL40zVO##pV1GpW69gL{vn;C#y0Ck^m Q2Pdj5&~Rh8tn7a-02jG2kpKVy delta 226 zcmY+8I}XAy5JYW$5kVkO(jw&u_N+fOH^?El1x-rRq2wqW(5#JRM7716nYYt8jjv}9 zZ#Ccyv{0I_6N6fA^8S`GtP>>z(mqilGGee_x;@I})IR@!W@TX2`{+%4ZWaYCnvv4NqnfvKsffe{0cWolr|pkOfBkuha6BVz|EnyiVL8C;efL)OsD z1TM?l!HlNY(AWqrD~PVw$jsOjE-Q|q*VxFALBSN_D(MbJRFh3iOcAbzBp>PjR{#KT??D;> delta 308 zcmYk%F%H5o429uF2r(cABqRoe)D?8)qS(~6F=aC&V+JFm+2kxHX$ccU2168e zrl#g5321sMhAD7?*iEJciy*g)0+O)@n#H828M ZXJldkw~oDo5mnaI)ClMps3n~L~6F=aC&V+JFm$>c01X$b>E2168e zre+2}bp{Z1%(;x4`&fz?Cn_jRVgnm!WMpJuW&k$O$ix(GAbSTR$U20qsj0Cs+!)UP FasZpKAo2hJ diff --git a/pluie/alpine-symfony/pre-init.d/10-symfony.sh b/pluie/alpine-symfony/pre-init.d/10-symfony.sh index 0eb8b8d..66ef499 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 - +ln -s /usr/bin/php7 /usr/bin/php if [ ! -d /app/$WWW_DIR ]; then cd /tmp mkdir $WWW_DIR diff --git a/pluie/alpine/README.md b/pluie/alpine/README.md index d9abbcb..4b4dc6f 100644 --- a/pluie/alpine/README.md +++ b/pluie/alpine/README.md @@ -5,6 +5,7 @@ - [pluie/alpine-apache][3] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 - [pluie/alpine-apache-fpm][7] ( ~ 50 MB ) Apache/2.4.23 Php/5.6.24 Fpm - [pluie/alpine-symfony][6] ( ~ 82 MB ) Symfony2.8 or 3.1 + - [pluie/alpine-apache-php7][8] ( ~ 50 MB ) Apache/2.4.25 Php/7.0.15 - [pluie/alpine-mysql][4] ( ~172 MB ) MariaDb/10.1.14 - [docker tips][5] @@ -105,3 +106,4 @@ RUN bash /scripts/install.sh [7]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-apache-fpm [5]: https://github.com/pluie-org/docker-images/blob/master/DOCKER.md [6]: https://github.com/pluie-org/docker-images/tree/master/pluie/alpine-symfony + [8]: https://github.com/pluie-org/docker-images/tree/master/pluie/7alpine-php diff --git a/pluie/alpine/files.tar b/pluie/alpine/files.tar index a8a3b31327e8c3ea13d1452fc6c99b706d0fcfad..ad837ae92a800dd9c0201ab74681f0f80e1848f4 100644 GIT binary patch delta 416 zcmZXQK?=e!5Jeknkrdo1Dy>i|=%zw4$s}v<;=-Q7F6&Or1qvR)1J;NoH4(B1{5Ss% z({!Zi$h|gonQf#{5f{upL}U=zAJ;l6m^qR2i;zof>MCEuA0-eSl?)VPK^G_xj-qY6 z@Jyien9kdop9%pyD)76V+45QQ@YL=%Y}s0%=)8!CYWp7D&m<_0}P7i})lEW@tg3m|a>4hV66?6RKk zz4vL#3zQf5`vE=`Z&R{@L`I2D6lzi?St)mbuN%O33gU`kV33t(w86lPTIS^+V{3+t zjy+kGHY==@R?=K;yiTfd?|_z@exH@rVOGKORfHw1zjn>Fzee&|VjHsa3|zkZ?eipl zTLd}e_xIs>a|{4_bry=iHcMT;iWSz6Fq^3Go{e0-2t=#Frnc$dxbz+CKoFwuu%;I6 M9{q72Tt8{?0I%a$Qvd(}