From 775cfba38c54ef28c7b1d3824e0013e35e0d1c4c Mon Sep 17 00:00:00 2001 From: a-sansara Date: Fri, 29 Jul 2016 13:51:56 +0200 Subject: [PATCH] all images from offical alpine:3.4 --- README.md | 4 +- pluie/alpine-apache/Dockerfile | 5 ++- pluie/alpine-apache/README.md | 2 +- pluie/alpine-apache/files.tar | Bin 10240 -> 10240 bytes pluie/alpine-apache/install.d/10-apache.sh | 4 +- .../alpine-apache/install.d/50-fix-apache.sh | 2 +- pluie/alpine-mysql/Dockerfile | 3 +- pluie/alpine-mysql/files.tar | Bin 10240 -> 10240 bytes pluie/alpine-mysql/install.d/40-mysql-fix.sh | 3 ++ pluie/alpine-mysql/main.sh | 2 - pluie/alpine-mysql/pre-init.d/10-db.sh | 38 +++++++++++++----- pluie/alpine/Dockerfile | 7 +++- pluie/alpine/README.md | 2 +- pluie/alpine/files.tar | Bin 20480 -> 20480 bytes pluie/alpine/install.d/00-util.sh | 1 + pluie/alpine/install.d/40-fix.sh | 1 + pluie/alpine/pre-init.d/50-example.sh | 1 + 17 files changed, 52 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index a30baea..88a98bd 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ based images for Docker ## Available Images -- __pluie/alpine__ ( < 10 MB) Alpine/3.2 -- __pluie/alpine-apache__ ( ~ 37 MB) Apache/2.4.16 Php/5.6.21 +- __pluie/alpine__ ( < 10 MB) Alpine/3.4 +- __pluie/alpine-apache__ ( ~ 37 MB) Apache/2.4.23 Php/5.6.24 - __pluie/alpine-mysql__ ( ~ 160 MB) Mysql/5.5.47 [MariaDB] ## Base Image Structure diff --git a/pluie/alpine-apache/Dockerfile b/pluie/alpine-apache/Dockerfile index c7293bf..eed96bd 100644 --- a/pluie/alpine-apache/Dockerfile +++ b/pluie/alpine-apache/Dockerfile @@ -6,7 +6,10 @@ 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 +ENV SHENV_NAME=Apache \ + SHENV_COLOR=67 \ + HTTP_SERVER_NAME=docker-site.dev \ + FIX_OWNERSHIP=1 EXPOSE 80 diff --git a/pluie/alpine-apache/README.md b/pluie/alpine-apache/README.md index 44a892f..88174e5 100644 --- a/pluie/alpine-apache/README.md +++ b/pluie/alpine-apache/README.md @@ -1,6 +1,6 @@ # pluie/alpine-apache -Extend pluie/alpine with apache 2.4.16 +Extend pluie/alpine with apache 2.4.23 - error log are attached to stdout - no need port redirection diff --git a/pluie/alpine-apache/files.tar b/pluie/alpine-apache/files.tar index 41b460fa6e248fc6216a9fef76afb987937ab55b..2b29c9b485888255959019619f02566e4b9f184a 100644 GIT binary patch delta 279 zcmX|)u?~Vj3_v+Y2ct0xBZI369CycW@BtTERhKob?EQ>?gPTw6T2N zsg4k>$^`d2)!dN_pNA02cuj4HfzM@{AV3`ENar+J{V9RJRaUS@%&Owh?L=y+YaE@j m)L!)USq1X<1p5#vgl(Z_dqjE6Q>0CVIg@z>rRLYidJn!Zqf}}D delta 265 zcmX|(F%E)25Jkb#LNRL8ZZBZM!tQbn4q#$%A%cQCq9$S^jdm79&Rf&A zh3(k&6cfVi%-LSQFFo*N7+3^CSjsrUgwRV7ZgI3}A%fO8XAmGI+3EP#eYM6DAJ-%% pt9~=5KsMXhg0C=lCv`xOmoz3YskN<-MIzG-&J9+>#b;0u;|EmRQK$d_ diff --git a/pluie/alpine-apache/install.d/10-apache.sh b/pluie/alpine-apache/install.d/10-apache.sh index 0e4713d..68a0f70 100755 --- a/pluie/alpine-apache/install.d/10-apache.sh +++ b/pluie/alpine-apache/install.d/10-apache.sh @@ -2,6 +2,6 @@ # pluie/docker-images - a-Sansara (https://github.com/a-sansara) apk --update add apache2 \ -php-apache2 php-cli php-phar php-zlib php-zip php-ctype php-mysqli php-pdo_mysql php-xml \ -php-opcache php-pdo php-json php-curl php-gd php-mcrypt php-openssl \ +php5-apache2 php5-cli php5-phar php5-zlib php5-zip php5-ctype php5-mysqli php5-pdo_mysql php5-xml \ +php5-opcache php5-pdo php5-json php5-curl php5-gd php5-mcrypt php5-openssl \ # php-pdo_odbc php-soap php-pgsql diff --git a/pluie/alpine-apache/install.d/50-fix-apache.sh b/pluie/alpine-apache/install.d/50-fix-apache.sh index 2b9a308..eea85b2 100755 --- a/pluie/alpine-apache/install.d/50-fix-apache.sh +++ b/pluie/alpine-apache/install.d/50-fix-apache.sh @@ -6,6 +6,6 @@ chown -R 1000:apache /app/www chmod -R 755 /scripts/pre-init.d sed -i 's#^DocumentRoot ".*#DocumentRoot "/app/www"#g' /etc/apache2/httpd.conf sed -i 's#AllowOverride none#AllowOverride All#' /etc/apache2/httpd.conf -sed -ir 's/expose_php = On/expose_php = Off/' /etc/php/php.ini +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-mysql/Dockerfile b/pluie/alpine-mysql/Dockerfile index 2015ac4..53ef8ca 100644 --- a/pluie/alpine-mysql/Dockerfile +++ b/pluie/alpine-mysql/Dockerfile @@ -6,7 +6,8 @@ ADD files.tar /scripts RUN bash /scripts/install.sh -ENV SHENV_NAME=Mysql SHENV_COLOR=132 +ENV SHENV_NAME=Mysql \ + SHENV_COLOR=132 EXPOSE 3306 diff --git a/pluie/alpine-mysql/files.tar b/pluie/alpine-mysql/files.tar index ce84fa1ec14dd9bcb0d22d8e937794a415a567ef..6434f2213903f5b3d3113bb00c04fa3116094a64 100644 GIT binary patch delta 881 zcmZ{j-%ry}6vtP@1simzm>}?QQif%T-PUbg<8YY43M?6PwwuHtS-SO3DqTC;4m8F< zFg_TgQTiX~qdu{BAN(Wyd%XQIG81hd+LQCW-*fLdpL<$6t(}j*n_>9~o8fc$e3s*K zd?d|gGF(0aX_qC`0dciOjH8#R?f$$4gYVG>@de`N6Q5$)d@h~$#C(>I02hd_oe{IS zY&thI3^lnlk2OQXE#jopH`aPwfh!YO1vfkKka? zfb;(mRsprU3$n1*kSg07P%hO=t0h^0y*+AqMAOreVk0RRJ$vm&C2m!AraEV{<34E!Ls34NJ6cwiSKfv>p0B(0D${G=5nx zC=~ope96liN*5*Q#Q#kHD*w;YYAe*Jts*_`AY2ec3B1S)o;4TU`Is0DMvPB-<}OVA z8r;75gIEjtyk2d{n^2P~PbyVmLy(s#Sh?(zKdDhX!Un=U(oeZ+bYa57We8`bZ5pY6=c99CYPLU+iZ8SoKN6vxP>uJVwD6fLI!UN~h`btM52Zv)1iSy}?Qy60& oLyck2bD2xn@4O}MW-{53^`V5rw`i30i+FqhpXbN^06Nn4r~m)} delta 654 zcmZWn%Wl(95Y4U1%L*ZCBna7bFhQY0CU)#=OEf_;)X*a81lw(dstVbS+geGSU^^f- zsH9@Sf{ONvEepN?;Uyb>ffXzMf<0WPaY5>=W=2P6&Y79L)?RDY^Sy}V&aNK4V_xv4}*|H<3 zM*U$mA?`T0!{qrm=LBEfbq56xao5FKfmzv{6YmL&n)A z`I#M8Ha6hCp(Q+&OueVlx#iWT=99bj z&7l**D6oh07-82Nayx /dev/null + mysql_install_db --user=mysql --verbose=1 --basedir=/usr --datadir=/var/lib/mysql --rpm > /dev/null if [ -z "$MYSQL_ROOT_PASSWORD" ]; then MYSQL_ROOT_PASSWORD=`pwgen -y -s 18 1` @@ -24,20 +35,19 @@ if [ ! -d /var/lib/mysql/mysql ]; then return 1 fi - cat << EOF > $tfile -USE mysql; -GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' WITH GRANT OPTION; -UPDATE user SET password=PASSWORD("$MYSQL_ROOT_PASSWORD") WHERE user='root'; + cat <<-EOF > $tfile +UPDATE mysql.user SET password=PASSWORD('$MYSQL_ROOT_PASSWORD') WHERE user='root'; +DELETE FROM mysql.user WHERE user='root' AND host NOT IN ('localhost', '127.0.0.1', '::1', '$(hostname)'); +DELETE FROM mysql.user WHERE user=''; +DELETE FROM mysql.db WHERE db='test' OR db='test\_%'; GRANT ALL PRIVILEGES ON *.* TO 'root'@'localhost' WITH GRANT OPTION; -UPDATE user SET password=PASSWORD("") WHERE user='root' AND host='localhost'; +UPDATE mysql.user SET password=PASSWORD("") WHERE user='root' AND host='localhost'; EOF if [ ! -z "$MYSQL_DATABASE" ]; then - echo "[[ CREATE DATABASE $MYSQL_DATABASE ]]"; echo "CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` CHARACTER SET utf8 COLLATE utf8_general_ci;" >> $tfile fi if [ "$MYSQL_USER" != "" ] && [ "$MYSQL_USER" != 'root' ]; then - echo "[[ CREATE USER $MYSQL_USER ]]"; echo " CREATE USER '$MYSQL_USER'@'localhost' IDENTIFIED BY '$MYSQL_PASSWORD'; CREATE USER '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD';" >> $tfile @@ -47,6 +57,14 @@ GRANT ALL ON \`$MYSQL_DATABASE\`.* to '$MYSQL_USER'@'localhost' IDENTIFIED BY '$ GRANT ALL ON \`$MYSQL_DATABASE\`.* to '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD';" >> $tfile fi fi - /usr/bin/mysqld --user=mysql --bootstrap --skip-grant-tables=0 --verbose=0 < $tfile - rm -f $tfile + echo "FLUSH PRIVILEGES;" >> $tfile + + mysql.secure $tfile & + + echo "[[ Starting Mysql Daemon ]]" + exec /usr/bin/mysqld --user=mysql --console --init-file="$tfile" + +else + echo "[[ Skipping DB init ]]" + echo "[[ Starting Mysql Daemon ]]" fi diff --git a/pluie/alpine/Dockerfile b/pluie/alpine/Dockerfile index fd5317c..6ee0949 100644 --- a/pluie/alpine/Dockerfile +++ b/pluie/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM gliderlabs/alpine:3.2 +FROM alpine:3.4 MAINTAINER a-Sansara https://github.com/a-sansara @@ -6,6 +6,9 @@ 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 +ENV TERM=xterm \ + SHENV_CTX=LOCAL \ + SHENV_NAME=Alpine \ + SHENV_COLOR=97 ENTRYPOINT ["/scripts/main.sh"] diff --git a/pluie/alpine/README.md b/pluie/alpine/README.md index b02453a..fe0fe20 100644 --- a/pluie/alpine/README.md +++ b/pluie/alpine/README.md @@ -6,7 +6,7 @@ This Image provide a Linux Alpine distribution with : - curl - nano as editor -Base image : [gliderlabs/alpine:3.2] (https://registry.hub.docker.com/u/gliderlabs/alpine/) +Base image : [alpine:3.4] (https://hub.docker.com/_/alpine/) This project come with a structure to facilitate further images (like pluie/alpine-apache & pluie/alpine-mysql) diff --git a/pluie/alpine/files.tar b/pluie/alpine/files.tar index e769b96d9e1465a75364d279f5d6203f74e3fd9f..a05ad1f35d2572bdad0dd81202726414f6b00680 100644 GIT binary patch delta 190 zcmZozz}T>WaYL_=fSHMbsksq@fuWJPu^EGc>10F3l+BF7&5V+U=B5llQ4=$`5>rD{ zQw9YCh!RF$#?8E9n;0ia^nwjBGXoi7W@Z34L=t3(36ddTB_>8jKzoo4kpUVa*CJ_X XYKXAU)EsDEZS delta 199 zcmZozz}T>WaYL_=fU&WevAHpWfuWJPu{nc+>10F3l+BF7&5V);<|Yh4Q4=$`5>rD{ z69xqXh!RF_#?8KBn;9o6I8Ku2MKZ_C)C_KpB*+{SbaPCMjEqptk%5>a*CJ_PYJg^| PiHQN4Y6Y