From f9cb304e15c09c6f44a1ec4d8531e6dcb2de3f3f Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Tue, 27 Oct 2020 10:11:41 +0100
Subject: Fixed mysql with wordpress and phpmyadmin

---
 srcs/mysql/Dockerfile          |  2 +-
 srcs/mysql/entrypoint.sh       | 33 +++++++++------------------------
 srcs/phpmyadmin/Dockerfile     |  2 +-
 srcs/phpmyadmin/config.inc.php |  2 +-
 4 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/srcs/mysql/Dockerfile b/srcs/mysql/Dockerfile
index 5f36a6c..372e1ea 100644
--- a/srcs/mysql/Dockerfile
+++ b/srcs/mysql/Dockerfile
@@ -7,7 +7,7 @@ RUN apk update && \
 
 COPY entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
-# COPY my.cnf /etc/my.cnf.d/ft_services.cnf
+COPY my.cnf /etc/my.cnf
 
 EXPOSE 3306
 
diff --git a/srcs/mysql/entrypoint.sh b/srcs/mysql/entrypoint.sh
index 07493b6..73e574e 100755
--- a/srcs/mysql/entrypoint.sh
+++ b/srcs/mysql/entrypoint.sh
@@ -1,37 +1,22 @@
 #!/bin/sh
 
-# mkdir -p /run/mysqld
-# mkdir -p /var/lib/mysql
-#
-# mysql_install_db --user=root --datadir=/var/lib/mysql > /dev/null
-#
-# /usr/bin/mysqld --user=root --datadir=/var/lib/mysql --bootstrap <<EOF
-# CREATE DATABASE wordpress;
-# CREATE USER 'root'@'%' IDENTIFIED BY 'root';
-# GRANT ALL PRIVILEGES ON wordpress.* TO 'root'@'%' IDENTIFIED BY 'root';
-# FLUSH PRIVILEGES;
-# EOF
-#
-# sleep 5
-#
-# sed -i "s|.*bind-address\s*=.*|bind-address=0.0.0.0|g" /etc/my.cnf.d/mariadb-server.cnf
-#
-# exec /usr/bin/mysqld --user=root --datadir=/var/lib/mysql
-
 mkdir -p /run/mysqld
 mkdir -p /var/lib/mysql
 
-mysql_install_db --user=root > /dev/null
+echo '-----------INSTALL-----------'
+mysql_install_db --user=root --datadir=/var/lib/mysql
 
-/usr/bin/mysqld --user=root --bootstrap <<EOF
+echo '-----------SETUP-----------'
+/usr/bin/mysqld --user=root --datadir=/var/lib/mysql --bootstrap <<EOF
+FLUSH PRIVILEGES;
 CREATE DATABASE wordpress;
 CREATE USER 'root'@'%' IDENTIFIED BY 'root';
 GRANT ALL PRIVILEGES ON wordpress.* TO 'root'@'%' IDENTIFIED BY 'root';
 FLUSH PRIVILEGES;
 EOF
 
-sleep 5
-
-sed -i "s|.*bind-address\s*=.*|bind-address=0.0.0.0|g" /etc/my.cnf.d/mariadb-server.cnf
+echo '-----------SLEEP-----------'
+sleep 3
 
-exec /usr/bin/mysqld --user=root
+echo '-----------DEAMON-----------'
+exec /usr/bin/mysqld --user=root --datadir=/var/lib/mysql
diff --git a/srcs/phpmyadmin/Dockerfile b/srcs/phpmyadmin/Dockerfile
index 220a394..f0e5e85 100644
--- a/srcs/phpmyadmin/Dockerfile
+++ b/srcs/phpmyadmin/Dockerfile
@@ -9,7 +9,7 @@ RUN curl 'https://files.phpmyadmin.net/phpMyAdmin/5.0.2/phpMyAdmin-5.0.2-all-lan
     unzip phpmyadmin.zip && \
     mv 'phpMyAdmin-5.0.2-all-languages' /var/www
 
-COPY config.inc.php /var/www/phpmyadmin
+COPY config.inc.php /var/www
 RUN mkdir /etc/phpmyadmin
 COPY config.inc.php /etc/phpmyadmin
 
diff --git a/srcs/phpmyadmin/config.inc.php b/srcs/phpmyadmin/config.inc.php
index ea20d8e..17656a5 100644
--- a/srcs/phpmyadmin/config.inc.php
+++ b/srcs/phpmyadmin/config.inc.php
@@ -29,7 +29,7 @@ $i++;
 /* Authentication type */
 $cfg['Servers'][$i]['auth_type'] = 'cookie';
 /* Server parameters */
-$cfg['Servers'][$i]['host'] = 'mysql-service:3306';
+$cfg['Servers'][$i]['host'] = 'mysql-service';
 $cfg['Servers'][$i]['compress'] = false;
 $cfg['Servers'][$i]['AllowNoPassword'] = false;
 
-- 
cgit