diff --git a/mysql/start.sh b/mysql/start.sh index a7d65a2..be08ad3 100755 --- a/mysql/start.sh +++ b/mysql/start.sh @@ -28,8 +28,10 @@ else # save sql echo "[i] Create temp file: $tfile" cat << EOF > $tfile -CREATE DATABASE wordpress; -CREATE USER 'pma'@'%' IDENTIFIED BY 'pma'; GRANT ALL PRIVILEGES ON *.* TO 'pma'@'%' WITH GRANT OPTION; USE wordpress; FLUSH PRIVILEGES; + CREATE DATABASE wordpress; + CREATE USER 'new'@'%' IDENTIFIED BY ''; + GRANT ALL PRIVILEGES ON *.* TO 'new'@'%' WITH GRANT OPTION; + FLUSH PRIVILEGES; EOF echo 'FLUSH PRIVILEGES;' >> $tfile diff --git a/phpmyadmin/Dockerfile b/phpmyadmin/Dockerfile index 19cbee9..274ae3d 100755 --- a/phpmyadmin/Dockerfile +++ b/phpmyadmin/Dockerfile @@ -1,13 +1,14 @@ FROM alpine:3.12 LABEL maintainer="mdenys" RUN apk update -RUN apk add supervisor nginx php7 php7-fpm php7-opcache php7-gd php7-mysqli php7-zlib php7-curl php7-mbstring php7-json php7-session +RUN apk add supervisor nginx php7 php7-fpm php7-opcache php7-gd php7-mysqli php7-zlib php7-curl php7-mbstring php7-json php7-session mysql RUN mkdir -p /var/www/localhost/htdocs/ RUN mkdir -p /run/php7 RUN mkdir -p /run/nginx RUN wget http://files.directadmin.com/services/all/phpMyAdmin/phpMyAdmin-5.0.1-all-languages.tar.gz RUN tar -xvf phpMyAdmin-5.0.1-all-languages.tar.gz --strip-components 1 -C /var/www/localhost/htdocs/ COPY phpmyadmin.inc.php /var/www/localhost/htdocs/config.inc.php +RUN mkdir -p /var/www/localhost/htdocs/tmp COPY nginx.conf /etc/nginx/conf.d/default.conf COPY supervisord.conf /etc/supervisord.conf EXPOSE 5000 diff --git a/phpmyadmin/phpmyadmin.inc.php b/phpmyadmin/phpmyadmin.inc.php index 7a3d3a3..488fa7c 100755 --- a/phpmyadmin/phpmyadmin.inc.php +++ b/phpmyadmin/phpmyadmin.inc.php @@ -5,10 +5,8 @@ $i++; $cfg['Servers'][$i]['auth_type'] = 'cookie'; $cfg['Servers'][$i]['host'] = 'mysql-service'; $cfg['Servers'][$i]['port'] = 3306; -$cfg['Servers'][$i]['connect_type'] = 'tcp'; $cfg['Servers'][$i]['compress'] = false; $cfg['Servers'][$i]['AllowNoPassword'] = true; -$cfg['Servers'][$i]['extension'] = 'mysqli'; $cfg['UploadDir'] = ''; $cfg['SaveDir'] = ''; ?> \ No newline at end of file diff --git a/phpmyadmin/supervisord.conf b/phpmyadmin/supervisord.conf index bf12d72..6c53e98 100755 --- a/phpmyadmin/supervisord.conf +++ b/phpmyadmin/supervisord.conf @@ -1,5 +1,6 @@ [supervisord] nodaemon=true +user=root [program:php] command= /usr/sbin/php-fpm7 [program:nginx]