From 238fbd1730089a3b421030bb4c75ae0221d20031 Mon Sep 17 00:00:00 2001
From: Charles <sircharlesaze@gmail.com>
Date: Wed, 22 Jul 2020 17:31:29 +0200
Subject: Added wordpress, phpmyadmin and mysql container

---
 srcs/mysql/Dockerfile                 | 19 ++++++-------------
 srcs/mysql/scripts/setup_mysql.sh     |  8 --------
 srcs/mysql/scripts/setup_mysql_db.sql |  5 -----
 srcs/mysql/src/entrypoint.sh          | 18 ++++++++++++++++++
 4 files changed, 24 insertions(+), 26 deletions(-)
 delete mode 100755 srcs/mysql/scripts/setup_mysql.sh
 delete mode 100755 srcs/mysql/scripts/setup_mysql_db.sql
 create mode 100755 srcs/mysql/src/entrypoint.sh

(limited to 'srcs/mysql')

diff --git a/srcs/mysql/Dockerfile b/srcs/mysql/Dockerfile
index f863eeb..393e0ac 100644
--- a/srcs/mysql/Dockerfile
+++ b/srcs/mysql/Dockerfile
@@ -1,18 +1,11 @@
-FROM alpine:3.10
-
-ENV MYSQL_ROOT_PASSWORD root
-ENV MYSQL_DATABASE ft_services_db
-ENV MYSQL_USER ft_services_user
-ENV MYSQL_PASSWORD ft_services_password
-ENV MYSQL_USER_MONITORING monitoring
-ENV MYSQL_PASSWORD_MONITORING monitoring
+FROM alpine
 
 RUN apk update && \
-	apk add --no-cache mysql-client
-COPY ./scripts /root/scripts
+    apk upgrade && \
+	apk add mysql mysql-client
 
-EXPOSE 3306
+COPY ./src /root
 
-# RUN /root/scripts/setup_mysql.sh
+EXPOSE 3306
 
-CMD ["mysql"]
+CMD ["/root/entrypoint.sh"]
diff --git a/srcs/mysql/scripts/setup_mysql.sh b/srcs/mysql/scripts/setup_mysql.sh
deleted file mode 100755
index 56f767f..0000000
--- a/srcs/mysql/scripts/setup_mysql.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-addgroup mysql mysql
-
-MYSQLD_DIR=/run/mysqld
-
-mkdir $MYSQLD_DIR
-chown mysql:mysql $MYSQL_DIR
diff --git a/srcs/mysql/scripts/setup_mysql_db.sql b/srcs/mysql/scripts/setup_mysql_db.sql
deleted file mode 100755
index ea66998..0000000
--- a/srcs/mysql/scripts/setup_mysql_db.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-CREATE DATABASE wordpressdb;
-CREATE USER 'wordpressuser'@'localhost' IDENTIFIED BY 'wordpresspass';
-GRANT ALL PRIVILEGES ON wordpressdb.* TO 'wordpressuser'@'localhost'
-IDENTIFIED BY 'wordpresspass';
-FLUSH PRIVILEGES;
diff --git a/srcs/mysql/src/entrypoint.sh b/srcs/mysql/src/entrypoint.sh
new file mode 100755
index 0000000..af327f7
--- /dev/null
+++ b/srcs/mysql/src/entrypoint.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+# addgroup mysql mysql
+#
+# MYSQLD_DIR=/run/mysqld
+#
+# mkdir $MYSQLD_DIR
+# chown mysql:mysql $MYSQL_DIR
+
+mysql -u root --skip-password <<EOF
+CREATE DATABASE wordpressdb;
+CREATE USER 'wordpressuser'@'localhost' IDENTIFIED BY 'wordpresspass';
+GRANT ALL PRIVILEGES ON wordpressdb.* TO 'wordpressuser'@'localhost';
+IDENTIFIED BY 'wordpresspass';
+FLUSH PRIVILEGES;
+EOF
+
+mysql
-- 
cgit