From 05585bc22367a7660c5c61837c7f333a411ea0e0 Mon Sep 17 00:00:00 2001
From: a-sansara <dev@pluie.org>
Date: Thu, 4 Aug 2016 03:00:33 +0200
Subject: [PATCH] adding TZ + enhance terminal output

---
 DOCKER.md                                     |   2 +-
 pluie/alpine-apache/Dockerfile                |   7 +++----
 pluie/alpine-apache/build                     |   2 +-
 pluie/alpine-apache/files.tar                 | Bin 10240 -> 10240 bytes
 .../alpine-apache/install.d/50-fix-apache.sh  |   1 -
 pluie/alpine-apache/main.sh                   |   2 +-
 pluie/alpine-mysql/Dockerfile                 |   4 ++--
 pluie/alpine-mysql/build                      |   2 +-
 pluie/alpine-mysql/files.tar                  | Bin 20480 -> 20480 bytes
 pluie/alpine-mysql/install.d/40-mysql-fix.sh  |   5 -----
 pluie/alpine-mysql/pre-init.d/10-db.sh        |  12 +++++++-----
 pluie/alpine/Dockerfile                       |   9 ++++++---
 pluie/alpine/build                            |   2 +-
 pluie/alpine/files.tar                        | Bin 20480 -> 20480 bytes
 pluie/alpine/install.d/00-util.sh             |   2 +-
 pluie/alpine/install.d/30-tz.sh               |  17 +++++++++++++++++
 pluie/alpine/install.d/40-fix.sh              |   2 ++
 pluie/alpine/pre-init.d/50-builder.sh         |   4 ++++
 pluie/alpine/pre-init.d/50-example.sh         |   5 -----
 pluie/alpine/util.sh                          |  10 +++++++++-
 20 files changed, 56 insertions(+), 32 deletions(-)
 delete mode 100644 pluie/alpine-mysql/install.d/40-mysql-fix.sh
 create mode 100644 pluie/alpine/install.d/30-tz.sh
 create mode 100755 pluie/alpine/pre-init.d/50-builder.sh
 delete mode 100755 pluie/alpine/pre-init.d/50-example.sh

diff --git a/DOCKER.md b/DOCKER.md
index 3fc62ce..adb2a29 100644
--- a/DOCKER.md
+++ b/DOCKER.md
@@ -45,7 +45,7 @@ rm -f to force stop running container before removing
 
 #### remove none images
 ```
-docker rmi $(docker images | grep "^<none>" | awk "{print $3}")
+docker rmi $(docker images | grep "^<none>" | awk "{print \$3}")
 ```
 
 #### remove all volumes
diff --git a/pluie/alpine-apache/Dockerfile b/pluie/alpine-apache/Dockerfile
index eed96bd..311a232 100644
--- a/pluie/alpine-apache/Dockerfile
+++ b/pluie/alpine-apache/Dockerfile
@@ -4,13 +4,12 @@ MAINTAINER a-Sansara https://github.com/a-sansara
 
 ADD files.tar /scripts
 
-RUN bash /scripts/install.sh
-
 ENV      SHENV_NAME=Apache \
         SHENV_COLOR=67 \
    HTTP_SERVER_NAME=docker-site.dev \
-      FIX_OWNERSHIP=1
+      FIX_OWNERSHIP=1 \
+      TZ=Europe/Paris
 
 EXPOSE 80
 
-VOLUME /app
+RUN bash /scripts/install.sh
diff --git a/pluie/alpine-apache/build b/pluie/alpine-apache/build
index 9d6370a..6bbd5f6 100755
--- a/pluie/alpine-apache/build
+++ b/pluie/alpine-apache/build
@@ -13,7 +13,7 @@ DOCKBUILD=$(basename $DOCKDIR)
 cd $DOCKDIR
 echo -e "\n  ${Ctitle} Preparing files : ${Coff}${Citem}\n"
 
-tar -cvf files.tar *.sh pre-init.d/ install.d/ | sed "s/^/${indent}* /"
+tar -cvf files.tar *.sh pre-init.d/ install.d/ | sed "s/^/${indent}↠ /"
 
 echo -e "\n  ${Ctitle} Proceed Dockerfile build : ${Coff}\n
 "
diff --git a/pluie/alpine-apache/files.tar b/pluie/alpine-apache/files.tar
index cc7b25324587ff67a2b13a75557e0f2b44d8afec..585da74737ab7c0d7f92abecb0943bb0d64b7342 100644
GIT binary patch
delta 153
zcmZn&Xb70lCT_}LXk>0`U}|7)U}VT(U}$7!V!)taFxinYWiumVGNW>4US>&1W=T$}
zf>LlvVo^zEUb>Qkl4C()az?6xOJZtne%|Ibrb@<5EWJDeaAS;(OiURROd-YyHZw{Z
anj50oWM*J&47W+Rf_ZZyS3Bb(2>}2(v?me(

delta 188
zcmZn&Xb70lCT_xDXk>0;YGP<)W@5@<0HjQf7!(X9J2IwhW@JoeR7y?G$X8H`j#daR
zNh~VK%u82rEJ#ewNL6r2OwG;DQ;3b-+|E?VxcNVGAJ61o7A`g;69WbXQ-}eA&5V*p
zCWat8Obv_-4NMG-fp(Y~7@5HB5Uya>D9TmPO;gY>PA<wUC@I!2C`#4M%*!m%OVKwq
Z&`qsK%q_@C)ho{6+Psh{o^g?c008PVG?M@T

diff --git a/pluie/alpine-apache/install.d/50-fix-apache.sh b/pluie/alpine-apache/install.d/50-fix-apache.sh
index 9dc690b..45d5c66 100755
--- a/pluie/alpine-apache/install.d/50-fix-apache.sh
+++ b/pluie/alpine-apache/install.d/50-fix-apache.sh
@@ -11,4 +11,3 @@ 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/main.sh b/pluie/alpine-apache/main.sh
index 15e9a49..e1687e3 100755
--- a/pluie/alpine-apache/main.sh
+++ b/pluie/alpine-apache/main.sh
@@ -3,5 +3,5 @@
 
 . /scripts/common.sh
 
-echo "[[ Starting Apache Daemon ]]"
+initTitle "Starting" "Apache Daemon"
 httpd -D FOREGROUND
diff --git a/pluie/alpine-mysql/Dockerfile b/pluie/alpine-mysql/Dockerfile
index 53ef8ca..5d60c5c 100644
--- a/pluie/alpine-mysql/Dockerfile
+++ b/pluie/alpine-mysql/Dockerfile
@@ -4,11 +4,11 @@ MAINTAINER a-Sansara https://github.com/a-sansara
 
 ADD files.tar /scripts
 
-RUN bash /scripts/install.sh
-
 ENV  SHENV_NAME=Mysql \
     SHENV_COLOR=132
 
 EXPOSE 3306
 
 VOLUME ["/var/lib/mysql", "/dump"]
+
+RUN bash /scripts/install.sh
diff --git a/pluie/alpine-mysql/build b/pluie/alpine-mysql/build
index 9d6370a..6bbd5f6 100755
--- a/pluie/alpine-mysql/build
+++ b/pluie/alpine-mysql/build
@@ -13,7 +13,7 @@ DOCKBUILD=$(basename $DOCKDIR)
 cd $DOCKDIR
 echo -e "\n  ${Ctitle} Preparing files : ${Coff}${Citem}\n"
 
-tar -cvf files.tar *.sh pre-init.d/ install.d/ | sed "s/^/${indent}* /"
+tar -cvf files.tar *.sh pre-init.d/ install.d/ | sed "s/^/${indent}↠ /"
 
 echo -e "\n  ${Ctitle} Proceed Dockerfile build : ${Coff}\n
 "
diff --git a/pluie/alpine-mysql/files.tar b/pluie/alpine-mysql/files.tar
index 41e357f238883fa3f5c502b79e4d07147e563242..9fdd15ebd6dbb9e987105e8ace69d5fe0202ab92 100644
GIT binary patch
delta 311
zcmZozz}T>WaYL_!fT@AGfsrADfuXUnkr{)6>10R7l+BEiEsPQ-Mhu2V=B5U46(%O;
z1`G-Y5EbkZjO?W)nK^pJ8IyfvT;wzJGD|`-OL9^bl!9HILxVj1+?5oRTpU9jog9N*
zl_sy3xvYSs#uKPKGchN#Diul9=Gn6OY)VL~f=d#MN;31(fogm!iwkoUToO}r^YbQa
zs|30sE6dI-D1az)aRS?-#H9cP$V#xAq%`>;zy0J5ERQFt^&$m@k%=ihDAajaH}e{N
KmS0?8!~y`i7hQe;

delta 423
zcmZozz}T>WaYL_!fRUkriGeYLfuXUnks*VE>10R7l+BEiEsPQdCJcr~=B5U46(%NT
zKotfM6^y=&lapke<WrL~@)eY#qZNW(okN2>{oEB?977zP9D`jIVq=x8Cm)u%ECpBN
znU`6TnV6GVm8#(41d^ZZAS=E3l58-WB3w;yNn%k+W?s62Z)I^|j)F^KYHofWQ0-)Q
zl|UDSs_e{y0+1@8IhjCHL56WD00BY;4s(<yALO^+yn%(0agtiEfRT~0nUOij`$ncF
zaPO=0uyW>ttk+G;te7ky<u^G+M?n&(7A-_f%}tDvL&OCb80C2ix<Lv>`S~SQAVNXE
zIJqdZprlxzt0-4NHx0orC`#1@IbAPB-_$@iwIVUMASYF?IAile6?w*q8~hjPC;$Kg
ChI}mm

diff --git a/pluie/alpine-mysql/install.d/40-mysql-fix.sh b/pluie/alpine-mysql/install.d/40-mysql-fix.sh
deleted file mode 100644
index 733cd27..0000000
--- a/pluie/alpine-mysql/install.d/40-mysql-fix.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# pluie/docker-images - a-Sansara (https://github.com/a-sansara)
-
-chown -R root:root /scripts/
-rm -f /scripts/pre-init.d/50-example.sh
diff --git a/pluie/alpine-mysql/pre-init.d/10-db.sh b/pluie/alpine-mysql/pre-init.d/10-db.sh
index cbefc82..28ca875 100644
--- a/pluie/alpine-mysql/pre-init.d/10-db.sh
+++ b/pluie/alpine-mysql/pre-init.d/10-db.sh
@@ -1,10 +1,12 @@
 #!/bin/bash
 # pluie/docker-images - a-Sansara (https://github.com/a-sansara)
 
+. /scripts/util.sh
+
 function mysql.secure(){
     chown mysql:mysql $1
     sleep 5
-    echo "[[ SECURING DATABASE ]]";
+    initTitle "SECURING" "DATABASE"
     echo "please wait."
     sleep 5
     rm -f $1
@@ -18,7 +20,7 @@ fi
 
 if [ ! -d /var/lib/mysql/mysql ]; then
 
-    echo "[[ Initialize DB ]]"
+    initTitle "Initialize" "DATABASE"
     chown -R mysql:mysql /var/lib/mysql
     mysql_install_db --user=mysql --verbose=1 --basedir=/usr --datadir=/var/lib/mysql --rpm > /dev/null
 
@@ -61,10 +63,10 @@ GRANT ALL ON \`$MYSQL_DATABASE\`.* to '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PA
 
     mysql.secure $tfile &
 
-    echo "[[ Starting Mysql Daemon ]]"
+    initTitle "Starting" "Mysql Daemon"
     exec /usr/bin/mysqld --user=mysql --console --init-file="$tfile"
 
 else
-    echo "[[ Skipping DB init ]]"
-    echo "[[ Starting Mysql Daemon ]]"
+    initTitle "Skipping" "DB init"
+    initTitle "Starting" "Mysql Daemon"
 fi
diff --git a/pluie/alpine/Dockerfile b/pluie/alpine/Dockerfile
index 6ee0949..2218003 100644
--- a/pluie/alpine/Dockerfile
+++ b/pluie/alpine/Dockerfile
@@ -4,11 +4,14 @@ MAINTAINER a-Sansara https://github.com/a-sansara
 
 ADD files.tar /scripts
 
-RUN apk --update add bash && bash /scripts/install.sh
-
 ENV     TERM=xterm \
    SHENV_CTX=LOCAL \
   SHENV_NAME=Alpine \
- SHENV_COLOR=97
+ SHENV_COLOR=97 \
+          TZ=Europe/Paris
+
+VOLUME /app
+
+RUN apk --update add bash && bash /scripts/install.sh
 
 ENTRYPOINT ["/scripts/main.sh"]
diff --git a/pluie/alpine/build b/pluie/alpine/build
index 9d6370a..6bbd5f6 100755
--- a/pluie/alpine/build
+++ b/pluie/alpine/build
@@ -13,7 +13,7 @@ DOCKBUILD=$(basename $DOCKDIR)
 cd $DOCKDIR
 echo -e "\n  ${Ctitle} Preparing files : ${Coff}${Citem}\n"
 
-tar -cvf files.tar *.sh pre-init.d/ install.d/ | sed "s/^/${indent}* /"
+tar -cvf files.tar *.sh pre-init.d/ install.d/ | sed "s/^/${indent}↠ /"
 
 echo -e "\n  ${Ctitle} Proceed Dockerfile build : ${Coff}\n
 "
diff --git a/pluie/alpine/files.tar b/pluie/alpine/files.tar
index 0dcd9d4a15efee6a5d23eb292449c86d2dfb374f..a630da08168e10757e481678da5c64ca4a473d18 100644
GIT binary patch
delta 1131
zcmaJ=-%ry}7+n)VnUa7;GkEdix(p<i+up9LuwXP{COj}qoG;r*EbZNPLx0S+JUD{G
z7<@A!^dI0)Fxmg7-rkK;mSA6Q)BAm==X~dUXIIkMmGt|^qh+F&jhsphUC|XoA!<%h
zNyX4}pv3PadnC<2yf<VXiyAC)=-SJZJn+ZyEz<$pjLhxgiMl1PuAYkTtOG4r0eJwZ
zNDv%UA?i_2TqSLy0Tq*@t!P?Ht!l5UdUexqp-2FUx(*WuwR%3t6j0l1lS!@Swpx&F
z)D-s?nC2cFh<i8wvtTW!v;lnxe2a!5^SX#rWAR||=jdYgt#tYL*FvgW(?}%;`dIgq
zdFlS)F>`Dh#EYf<*nSL48X;4o(shlbqmuTdVTQNmdy&aJ8o(IGhQqJ7=o4kr?K{Ve
zZumiW%p2re6&i7SQPdB&Fz&KwBQ3__4coqTL<5<*W|xKnV8(5GC_nl>yCGc`veHPI
zTRM@pG&eV+DRMO6!al}_%P$JXbOg#}Lrrx(|0E3)M;lFUDU?dwW4QweABO=BduBlK
z!1pNgIzArPWNa7n7`MIwOd|_7n!;eK{~rV-Dn-g7=2Da&Ch;-*M_^M2qCt`%fiejk
zDxNf&7~^$(ieUSiYKBJA?jG4J0Qs)}-XLUi$Y~~AhBzg2H|?q5W)jX5>^64yYR&z6
z4YnYek|^dnXtvAac~9D0l&4OZxq2m5VG6On4?DH@yY<=*T!W)L-=FyJ%J~w}D^po5
zS5zMF$yz_HOY7f&tCKq>S7i44HwyWROwB*uD;7qdpZU^d>AX-;rhyGZOMzFr(t~S<
KMqk!0R{jAv{xTH+

delta 335
zcmZozz}T>WaYHkYl%bi4IfJ2*xv7DXp@E5kF@u4jk(s#(gMz_iN5+)RjJ(_|lTQnV
zN~R`f<SQseM=Jyr<tL{W7iZ?BE2v~D#Kumx5^9?y(klShZftC1$e>^f(Jso%$evn}
zm|KvOI$2Q1e{zbBqJ+6AnuVsOCI)Z|HT@U`6mp6cbaN6F^ox^=G7CzIH&4(iV4SF6
zI7tfG9wU%0s6Eo0oRhgUsw53f&<!^+Gcbc2&gjc1R+Outo2H;&mRO{poS2-Es-IYp
st*^EDqJ%!<<N(IpNjj|(riN%PG%+_r7^0ib2v)thL9am(NW5eL0P{3f8~^|S

diff --git a/pluie/alpine/install.d/00-util.sh b/pluie/alpine/install.d/00-util.sh
index 86c4209..fe63503 100755
--- a/pluie/alpine/install.d/00-util.sh
+++ b/pluie/alpine/install.d/00-util.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 # pluie/docker-images - a-Sansara (https://github.com/a-sansara)
 
-apk --update add nano curl
+apk --update add nano curl tzdata
diff --git a/pluie/alpine/install.d/30-tz.sh b/pluie/alpine/install.d/30-tz.sh
new file mode 100644
index 0000000..85d5ae9
--- /dev/null
+++ b/pluie/alpine/install.d/30-tz.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# pluie/docker-images - a-Sansara (https://github.com/a-sansara)
+
+if [ ! -z "$TZ" ] && [ -f "/usr/share/zoneinfo/$TZ" ]; then
+    echo "$TZ" > /etc/TZ
+    cp "/usr/share/zoneinfo/$TZ" "/etc/localtime"
+    apk del tzdata
+    if [ ! "${TZ///*/}" = "$TZ" ]; then
+        mkdir -p "/usr/share/zoneinfo/${TZ///*/}"
+    fi
+    cp /etc/localtime "/usr/share/zoneinfo/$TZ"
+    echo -e "\033[1;38;5;203mTIMEZONE : $TZ"
+    date
+    echo -en "\033[m"
+else
+    echo -e "\033[1;38;5;203mNO DEFINED TIMEZONE"
+fi
diff --git a/pluie/alpine/install.d/40-fix.sh b/pluie/alpine/install.d/40-fix.sh
index 29b327e..ebb9d63 100755
--- a/pluie/alpine/install.d/40-fix.sh
+++ b/pluie/alpine/install.d/40-fix.sh
@@ -1,4 +1,6 @@
 #!/bin/bash
 # pluie/docker-images - a-Sansara (https://github.com/a-sansara)
 
+#~ cp -fa "/app/localtime" "/etc/localtime"
 rm -f /var/cache/apk/*
+chown -R root:root /scripts/
diff --git a/pluie/alpine/pre-init.d/50-builder.sh b/pluie/alpine/pre-init.d/50-builder.sh
new file mode 100755
index 0000000..37fd493
--- /dev/null
+++ b/pluie/alpine/pre-init.d/50-builder.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+# pluie/docker-images - a-Sansara (https://github.com/a-sansara)
+
+echo -e "\ncontainer builded by \033[1;38;5;209mpluie.org\033[m - \033[1;38;5;32mhttps://git.pluie.org/pluie/docker-images\033[m\n"
diff --git a/pluie/alpine/pre-init.d/50-example.sh b/pluie/alpine/pre-init.d/50-example.sh
deleted file mode 100755
index b987ff2..0000000
--- a/pluie/alpine/pre-init.d/50-example.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-# pluie/docker-images - a-Sansara (https://github.com/a-sansara)
-
-# ls -la /scripts
-chown -R root:root /scripts/
diff --git a/pluie/alpine/util.sh b/pluie/alpine/util.sh
index b96dd1b..c6894a9 100755
--- a/pluie/alpine/util.sh
+++ b/pluie/alpine/util.sh
@@ -21,11 +21,19 @@ function bash_prompt() {
     export PS1="${Cdate}\t ${Cwhite}${Cctx} DOCKER ${SHENV_CTX} ${Cname} ${SHENV_NAME} ${Coff} ${Cuser}\u${Chost}@\h ${Cpath}\w ${Csymbol}\$ ${Coff}"
 }
 
+function initTitle(){
+    local data=${1:-''}
+    if [ ! -z "$2" ]; then
+        data="$data\033[1;38;5;97m $2 "
+    fi
+    echo -e "\n\033[1;33m[[ \033[1;38;5;30m$data\033[1;33m]]\033[m"
+}
+
 function preInit(){
     for i in ls $1/*.sh
     do
         if [ -e "${i}" ]; then
-            echo "[[ Processing $i ]]"
+            initTitle "Processing" "$i"
             . "${i}"
         fi
     done