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 "^" | awk "{print $3}") +docker rmi $(docker images | grep "^" | 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 cc7b253..585da74 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 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 41e357f..9fdd15e 100644 Binary files a/pluie/alpine-mysql/files.tar and b/pluie/alpine-mysql/files.tar differ 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 0dcd9d4..a630da0 100644 Binary files a/pluie/alpine/files.tar and b/pluie/alpine/files.tar differ 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