From 123a7f3d980fa1660fbcf8eef1e4740d81727a62 Mon Sep 17 00:00:00 2001
From: Charles Cabergs <me@cacharle.xyz>
Date: Tue, 27 Oct 2020 10:50:59 +0100
Subject: Added mysql database volume

---
 srcs/mysql/entrypoint.sh | 13 +++++++------
 srcs/mysql/mysql.yaml    | 43 +++++++++++++++++++++----------------------
 2 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'srcs/mysql')

diff --git a/srcs/mysql/entrypoint.sh b/srcs/mysql/entrypoint.sh
index 73e574e..80ec84c 100755
--- a/srcs/mysql/entrypoint.sh
+++ b/srcs/mysql/entrypoint.sh
@@ -3,11 +3,13 @@
 mkdir -p /run/mysqld
 mkdir -p /var/lib/mysql
 
-echo '-----------INSTALL-----------'
-mysql_install_db --user=root --datadir=/var/lib/mysql
+if [ ! -d /var/lib/mysql/mysql ]
+then
+    echo '-----------INSTALL-----------'
+    mysql_install_db --user=root --datadir=/var/lib/mysql
 
-echo '-----------SETUP-----------'
-/usr/bin/mysqld --user=root --datadir=/var/lib/mysql --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';
@@ -15,8 +17,7 @@ GRANT ALL PRIVILEGES ON wordpress.* TO 'root'@'%' IDENTIFIED BY 'root';
 FLUSH PRIVILEGES;
 EOF
 
-echo '-----------SLEEP-----------'
-sleep 3
+fi
 
 echo '-----------DEAMON-----------'
 exec /usr/bin/mysqld --user=root --datadir=/var/lib/mysql
diff --git a/srcs/mysql/mysql.yaml b/srcs/mysql/mysql.yaml
index 17ba1e8..e871e05 100644
--- a/srcs/mysql/mysql.yaml
+++ b/srcs/mysql/mysql.yaml
@@ -21,13 +21,13 @@ spec:
         - image: cacharle-mysql
           imagePullPolicy: Never
           name: cacharle-mysql-container
-      #     volumeMounts:
-      #       - name: mysql-volume
-      #         mountPath: /var/lib/data
-      # volumes:
-      #   - name: mysql-volume
-      #     persistentVolumeClaim:
-      #       claimName: mysql-volume
+          volumeMounts:
+            - name: mysql-volume
+              mountPath: /var/lib/mysql
+      volumes:
+        - name: mysql-volume
+          persistentVolumeClaim:
+            claimName: mysql-volume
 
 ---
 
@@ -39,7 +39,6 @@ metadata:
     app: mysql
 spec:
   type: ClusterIP
-  # clusterIP: None
   ports:
     - name: mysql
       port: 3306
@@ -47,17 +46,17 @@ spec:
   selector:
     app: mysql
 
-# ---
-#
-# apiVersion: v1
-# kind: PersistentVolumeClaim
-# metadata:
-#   name: mysql-volume
-#   labels:
-#     app: mysql
-# spec:
-#   accessModes:
-#     - ReadWriteOnce  # read/write by one pod
-#   resources:
-#     requests:
-#       storage: 1Gi
+---
+
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: mysql-volume
+  labels:
+    app: mysql
+spec:
+  accessModes:
+    - ReadWriteOnce  # read/write by one pod
+  resources:
+    requests:
+      storage: 1Gi
-- 
cgit