From 28533f0cce6eb67e158b813d5f3cd00e92e7157f Mon Sep 17 00:00:00 2001 From: a-sansara Date: Thu, 16 Mar 2017 04:35:46 +0100 Subject: [PATCH] fixing symfony init + enabling gateway ip on dev --- pluie/alpine-apache-fpm/files.tar | Bin 10240 -> 10240 bytes pluie/alpine-apache-php7/files.tar | Bin 10240 -> 20480 bytes pluie/alpine-apache-php7/install.d/00-repo.sh | 13 ++++++++++--- .../alpine-apache-php7/install.d/10-apache.sh | 2 +- pluie/alpine-fpm-php7/install.d/00-repo.sh | 6 +++--- pluie/alpine-symfony-php7/files.tar | Bin 10240 -> 10240 bytes .../pre-init.d/10-symfony.sh | 8 +++++--- pluie/alpine-symfony/files.tar | Bin 10240 -> 10240 bytes pluie/alpine-symfony/pre-init.d/10-symfony.sh | 13 ++++++------- 9 files changed, 25 insertions(+), 17 deletions(-) diff --git a/pluie/alpine-apache-fpm/files.tar b/pluie/alpine-apache-fpm/files.tar index a484cb48865274f805fa3678e2815842cb3a564e..b0b790d75393b32bf7f685a1b0556f7d2061bd42 100644 GIT binary patch delta 85 zcmZn&Xb9NQFT`hTZfe9}U}$V)YQUgiI@ysiWiz92Goz$|xeiRcGbLH*Q{Wc`AS0#gv7mzkHj`G?d$rbTjG01&+xzW@LL diff --git a/pluie/alpine-apache-php7/files.tar b/pluie/alpine-apache-php7/files.tar index fa6f04f9954fc957b083dda63d143fe5b9922faa..df15b390599eeef3f47ff1b92a7144364deae014 100644 GIT binary patch delta 442 zcmZn&Xjs6wp;t)2#K6GJ(2T*r(Adbtgh9b{vLj>4W=7#APANkp0}}>AV*@iIxEd34 zQ*#Cd1Be>gLPk#II)&8ajC=*9$!p}ac$4#Ub4&9wODeg5;y@97W(ciSUy@o}l9`td z5{IbIC@Cqh($`PSDag!A)l1LGOi3-uNlYr%1DXL9)lW@HPt`{;lW1MJiJ5sI%b*$z z2-}0?LL~*e$^7yXf+#Lc$4W=7#APALNu6LSWTw2`5axv?2Y zjfuIrA%lVeM2&1A}9pSpXW+B%S~O 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 7687ea4dbb075b895fa8cb0db24a337dc464a563..3c22fcfc8a6a9b99a37b2f3673bf554ef8e4cf34 100644 GIT binary patch delta 242 zcmZn&Xb9NQ%OYT6U|?!$&R}3@Y;0`EpkO-Lkuha6BWp9Gq?wrsgQ2m3nGsxxshN=h zgMtA>340MEqvGTu4!y~nIaDQ!ausxo(iHR)3kvkhQ|N#y@HGauCz=p22?On!FCas8~~);J1YPH delta 109 zcmZn&Xb9NQ%OYTCY-DI`&R}3@Y;0u8pkO-Lkuha6BWp9Gq^W@+gQ2m38BiXo#MI2d zh(W;sqJ+JOadIh#E?;hTN@kIQN_cp9yo+bh~6F=aC&V>6?qnUNWTp|OFP5nPF>nSlv| zf&oMca}gt>;^ZP0y~&4JR3(dY6?BWz6!a4d3iQiUleiRsAh%3GH*NAO7K8fajNJSb z1>GP8b8~ZunzF|ssg0&Q<0y&uqO8Qn-hWf?&AWB_FL0tu6l)e(&5g^CJr=*tYu@__%aHVB(0Ue&T Hh)oFqBWyvc delta 178 zcmZn&Xb70lD`04BWN2p2U|?u$Y;3@wU^>~6F=aC&V>6?qsi`T0p|OFP5nPF>nV~U* zf&oMca}nd@QWjmgoMHvtoJ0lvlH39=1t7@HPRT4%PzetYk9YA5nmm_9iz&Bk@>F zF^G(Afr5TwL4kf*Vv&AMetPlbH!SjUKn_@Qaz<``ih^#CLb`T2L>X6FCKu4c$&1*O E0Qa^q&;S4c 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