From e946a39e7c430e600c6c0869b23d9c82996cb68a Mon Sep 17 00:00:00 2001 From: a-Sansara Date: Tue, 14 Aug 2018 02:21:22 +0200 Subject: [PATCH] add base ubuntu lts + update libyaml with base ubuntu --- pluie/libyaml/Dockerfile | 4 +- pluie/libyaml/files.tar | Bin 10240 -> 10240 bytes pluie/libyaml/install.d/11-vala.sh | 10 --- pluie/libyaml/install.d/20-vala.sh | 14 ++++ pluie/libyaml/main.sh | 8 +- pluie/libyaml/pre-init.d/11-vala.sh | 4 - pluie/libyaml/pre-init.d/50-builder.sh | 4 + pluie/ubuntu/Dockerfile | 20 +++++ pluie/ubuntu/README.md | 109 +++++++++++++++++++++++++ pluie/ubuntu/build | 22 +++++ pluie/ubuntu/common.sh | 10 +++ pluie/ubuntu/files.tar | Bin 0 -> 20480 bytes pluie/ubuntu/install.d/00-util.sh | 4 + pluie/ubuntu/install.d/10-ps1.sh | 13 +++ pluie/ubuntu/install.d/30-ts.sh | 17 ++++ pluie/ubuntu/install.d/40-fix.sh | 6 ++ pluie/ubuntu/install.sh | 6 ++ pluie/ubuntu/main.sh | 6 ++ pluie/ubuntu/pre-init.d/50-builder.sh | 5 ++ pluie/ubuntu/util.sh | 40 +++++++++ 20 files changed, 282 insertions(+), 20 deletions(-) delete mode 100644 pluie/libyaml/install.d/11-vala.sh create mode 100644 pluie/libyaml/install.d/20-vala.sh delete mode 100644 pluie/libyaml/pre-init.d/11-vala.sh create mode 100644 pluie/libyaml/pre-init.d/50-builder.sh create mode 100644 pluie/ubuntu/Dockerfile create mode 100644 pluie/ubuntu/README.md create mode 100755 pluie/ubuntu/build create mode 100644 pluie/ubuntu/common.sh create mode 100644 pluie/ubuntu/files.tar create mode 100644 pluie/ubuntu/install.d/00-util.sh create mode 100644 pluie/ubuntu/install.d/10-ps1.sh create mode 100644 pluie/ubuntu/install.d/30-ts.sh create mode 100644 pluie/ubuntu/install.d/40-fix.sh create mode 100644 pluie/ubuntu/install.sh create mode 100755 pluie/ubuntu/main.sh create mode 100644 pluie/ubuntu/pre-init.d/50-builder.sh create mode 100644 pluie/ubuntu/util.sh diff --git a/pluie/libyaml/Dockerfile b/pluie/libyaml/Dockerfile index cac7ffe..94f016d 100644 --- a/pluie/libyaml/Dockerfile +++ b/pluie/libyaml/Dockerfile @@ -1,7 +1,7 @@ # @app pluie/libyaml # @author a-Sansara https://git.pluie.org/pluie/docker-images -FROM pluie/libecho +FROM pluie/ubuntu MAINTAINER a-Sansara https://github.com/a-sansara @@ -11,4 +11,4 @@ ENV SHENV_NAME=libyaml \ SHENV_COLOR=36 \ TZ=Europe/Paris -RUN bash /scripts/install.sh +RUN /bin/bash /scripts/install.sh diff --git a/pluie/libyaml/files.tar b/pluie/libyaml/files.tar index 93b1e156a2e17c5754711fe6735c08f9d721367b..4c983ba57e2a0828164708b45b0ab92a12706158 100644 GIT binary patch literal 10240 zcmeH~T~FIE6ozx{U*VPAI?iV^4Izy|k$Mv(V7sl{#H1dH6WK0W|NZQ=r5O^8i)I?y z@r{%C>*P5;@39*uq_0=rm?f|!%Tmu)VU`BN+BF5yH1xtaj*}z^k|^_nFq$TThl4SV z+Rwe#hAE6aMl_R}DYkETR{yE}S@-wydh&rTg``WSSLg(PVO@v&($#ChX)Tr;*3^B= z+N@d&3Nv!M1%+3}bow);l`wwa-)~h#wW?M-=r}*m7gsmewp)IA zCR-__;ffVTJaV+XAbjgeW`wM;-e|)c-}fhobq4RYG$tEdxzrT-0V(;TOH&o+B=A4& zU)^n^e|CAVDhliZpui2+twha3Db(P8a*A!L`?xsWtv=rhr(3_j@sQrAl6PE|To#+j z+mq>G{2-$qKBC?pOo%%8&JT> z%M1$YaUAq}#ws~dH=g#YV)L72UmS%ZvgMV~zE6SaLdjv&tmxaew|ma_Whckaa%=?b zzVL>FuDKE=n6HAHh5X=cLjs!YVE4k?p%FX3D8VkvncUKS%G@y74!s(+?|$X2;Q#CE z9F!o|4YXvNt;L@4Tj$@Hm-8QIrX3hDh%yh-%~rIU_&-1YEB}WfIhj-V_-J7LpC!p! z_m?D+t6S- zql?Z(vSBUC)XsJ(-A1+#lWa;G2sZmWocJCA*_r&OX||Mqd+vW%{}YoUTK$ib5cU6_ z?;c_Q<^Rp(-}(QR{wHy==>OUONgkW{kNN*2JbZhOyZOJB@juW1`EUeYmUB=j#mVOQ zHl*0*SO4h=%pC%Xrtif1R#8s}YOV|Om4evI#gh3`JKnu$!q?Kt=AKsQzOyk&iEr}z z2R3O1l!1#j^N3D%uN=->AIPV*4a3sy4TDxBfCP{L5-!n_YuR=UFQnZxs#o4**jB4XEX%U3 zHfdXC%^;RZNDYkjnKaX!rOZhHYL1pVVd^B#tZD9US^J#u@AL5ViGJ>d`ni*im8bC5 ziDMAI*v~wwXXjbSGSQH+afCR5qaEfr!I-f)-PH99k2QpNBT6pxyyGx(KhZ?<0_TFJ ziqZf*brUaUsh%;fGV z5Fg>PFBJj%&#mTG{kr_L$yB_M=GDn<@#1@X|Mm`U^@trduJo|@09LEiTd2Jpd-Ha3 zDbg&ZN?XTK%5LhKN)@WotKdBH@0Eg57nW(sO)1m3jZZWhO~t16U?mtw34;%ZWLrhJ zILwm)1H2WVGQk@Jb^^P-oqsw9_p{= zn0MkxP6n6!Hvh=Upw1t7FIAZ+%G7CjUE24UPoKZYJvPS%t#r2Q*JM-M*qF@x^$BQS z(P_;a9)_MSI;eGiDIJJU%&T?)bra_Njk@CqGz#h2Z2pOb^WSVD4J`TJikq(Mc5(iXz4KmW1Ya{XTg_RDn4=ARf^oRSqU{bKlK>wgoA{qp=TumA0)DcApHQ@4`# z#q0m7_&-rlU|}=@J&7WwH*y{zC1oKGqCRjP2CrXtdVBEZO;s{+mAoVw!GE{=imr`n zi-JW4Y7q_mtWXPKgZyEd5O2)R2@B>6=0-Zh5D?wOj-^)U3iXCfLK4SW$t?UlCA0Xq z42`Ah2!FxN$3D;_rfIWf{dMn(aiJws{_*8^40(nL?kcq*@d zMNYsAN0FY(R4BeY8pUf2SIS(yf1Ixv@d6F1kQ8JM^8%U^6U9=5)JFeU*Y%e=5*)}X z-WrmV7s02Ymw?B+u_t%fB${wxYzB#CUEP7 zFlWZ9y+UM&csHbcsGrU?6)nh8mI}K)*zN4?cRRaK>Q?zu`4E04$M`i7n63Y|p^dyR z>(~I6<$oq=-dz7%MCN}F;xG@h{yQ-P*QZXXAg_HHf_4Br58UK`W*M1Wh#q9h=LVU@ zzhP)=It*SG|D-+T|BCZpyNyS}lK-2Vsr5V*CvUr*zjk`vy|Zqwi|4DIgLgaq{g0iq z!%nBW&613QG85c?*FD=i=%HA5cRP$iFJv@v@O<|(Rd}FhvB*;RZQ)&@T|wxC5x806 z1N+KPz+|wmXF{b`iGV~vA|Mfv2uK7Z0ulj> /root/.bashrc +if [ -f ~/.bash_ps1 ]; then + . ~/.bash_ps1 +fi +EOF + sed -n '1,22 p' /scripts/util.sh > /root/.bash_ps1 + echo "bash_prompt" >> /root/.bash_ps1 +fi diff --git a/pluie/ubuntu/install.d/30-ts.sh b/pluie/ubuntu/install.d/30-ts.sh new file mode 100644 index 0000000..752d217 --- /dev/null +++ b/pluie/ubuntu/install.d/30-ts.sh @@ -0,0 +1,17 @@ +#!/bin/bash +# @app pluie/alpine +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +if [ ! -z "$TZ" ] && [ -f "/usr/share/zoneinfo/$TZ" ]; then + echo "$TZ" > /etc/TZ + cp "/usr/share/zoneinfo/$TZ" "/etc/localtime" + 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/ubuntu/install.d/40-fix.sh b/pluie/ubuntu/install.d/40-fix.sh new file mode 100644 index 0000000..600995e --- /dev/null +++ b/pluie/ubuntu/install.d/40-fix.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# @app pluie/alpine +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +apt clean +chown -R root:root /scripts/ diff --git a/pluie/ubuntu/install.sh b/pluie/ubuntu/install.sh new file mode 100644 index 0000000..34e9ff5 --- /dev/null +++ b/pluie/ubuntu/install.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# @app pluie/ubuntu +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +. /scripts/util.sh +preInit "/scripts/install.d" diff --git a/pluie/ubuntu/main.sh b/pluie/ubuntu/main.sh new file mode 100755 index 0000000..e55763c --- /dev/null +++ b/pluie/ubuntu/main.sh @@ -0,0 +1,6 @@ +#!/bin/bash +# @app pluie/alpine +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +. /scripts/common.sh +bash diff --git a/pluie/ubuntu/pre-init.d/50-builder.sh b/pluie/ubuntu/pre-init.d/50-builder.sh new file mode 100644 index 0000000..245fce7 --- /dev/null +++ b/pluie/ubuntu/pre-init.d/50-builder.sh @@ -0,0 +1,5 @@ +#!/bin/bash +# @app pluie/ubuntu +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +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/ubuntu/util.sh b/pluie/ubuntu/util.sh new file mode 100644 index 0000000..4ce801e --- /dev/null +++ b/pluie/ubuntu/util.sh @@ -0,0 +1,40 @@ +#!/bin/bash +# @app pluie/alpine +# @author a-Sansara https://git.pluie.org/pluie/docker-images + +function bash_prompt() { + local Cenvcode="243" + if [ "$SHENV_CTX" = "INT" ]; then + local Cenvcode="202" + elif [ "$SHENV_CTX" = "PROD" ]; then + local Cenvcode="160" + fi + local Cdate="\[\033[1;33m\]" + local Cctx="\[\033[1;48;5;${Cenvcode}m\]" + local Cname="\[\033[1;48;5;${SHENV_COLOR}m\]" + local Cpath="\[\033[1;38;5;36m\]" + local Cwhite="\[\033[1;38;5;15m\]" + local Chost="\[\033[1;38;5;15m\]" + local Csymbol="\[\033[1;38;5;15m\]" + local Cuser="\[\033[1;38;5;203m\]" + local Coff="\[\033[m\]" + 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 + initTitle "Processing" "$i" + . "${i}" + fi + done +}