Please end my suffuring

6 files changed, 175 insertions, 59 deletions

diff --git a/srcs/mysql/Dockerfile b/srcs/mysql/Dockerfile
index 4afd86f..448080e 100644
--- a/srcs/mysql/Dockerfile
+++ b/srcs/mysql/Dockerfile
@@ -1,13 +1,16 @@
-FROM alpine
-
-RUN apk update && \
-    apk upgrade && \
-	apk add mysql mysql-client --no-cache
-
-
-COPY src/entrypoint.sh /root/entrypoint.sh
-COPY src/my.cnf /etc/my.cnf
-
+FROM alpine:latest
+#init
+RUN apk -U upgrade
+#install nginx/php
+RUN apk add vim mysql mysql-client
+# RUN apk add telegraf --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted --no-cache
+#Expose PORT
 EXPOSE 3306
-
-CMD ["/root/entrypoint.sh"]
+COPY my.cnf /etc/
+COPY start.sh .
+#COPY wordpress .
+# COPY init.sql .
+#telegraf
+# RUN mkdir -p /etc/telegraf
+# COPY telegraf.conf /etc/telegraf/telegraf.conf
+CMD /bin/sh /start.sh
diff --git a/srcs/mysql/my.cnf b/srcs/mysql/my.cnf
new file mode 100644
index 0000000..a366ea4
--- /dev/null
+++ b/srcs/mysql/my.cnf
@@ -0,0 +1,129 @@
+# The MySQL database server configuration file.
+#
+# You can copy this to one of:
+# - "/etc/mysql/my.cnf" to set global options,
+# - "~/.my.cnf" to set user-specific options.
+#
+# One can use all long options that the program supports.
+# Run program with --help to get a list of available options and with
+# --print-defaults to see which it would actually understand and use.
+#
+# For explanations see
+# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
+
+# This will be passed to all mysql clients
+# It has been reported that passwords should be enclosed with ticks/quotes
+# escpecially if they contain "#" chars...
+# Remember to edit /etc/mysql/debian.cnf when changing the socket location.
+[client]
+port        = 3306
+socket      = /var/run/mysqld/mysqld.sock
+default-character-set = utf8mb4
+
+# Here is entries for some specific programs
+# The following values assume you have at least 32M ram
+
+# This was formally known as [safe_mysqld]. Both versions are currently parsed.
+[mysqld_safe]
+socket      = /var/run/mysqld/mysqld.sock
+nice        = 0
+
+[mysqld]
+#
+# * Basic Settings
+#
+user        = mysql
+pid-file    = /var/run/mysqld/mysqld.pid
+socket      = /var/run/mysqld/mysqld.sock
+port        = 3306
+basedir     = /usr
+datadir     = /var/lib/mysql
+tmpdir      = /tmp
+lc-messages-dir = /usr/share/mysql
+skip-external-locking
+collation_server = utf8mb4_unicode_ci
+character_set_server = utf8mb4
+bind-address            = 0.0.0.0
+
+#
+# Instead of skip-networking the default is now to listen only on
+# localhost which is more compatible and is not less secure.
+#
+# * Fine Tuning
+#
+key_buffer      = 16M
+max_allowed_packet  = 16M
+thread_stack        = 192K
+thread_cache_size       = 8
+# This replaces the startup script and checks MyISAM tables if needed
+# the first time they are touched
+myisam-recover         = BACKUP
+#max_connections        = 100
+#table_cache            = 64
+#thread_concurrency     = 10
+#
+# * Query Cache Configuration
+#
+query_cache_limit   = 1M
+query_cache_size        = 16M
+#
+# * Logging and Replication
+#
+# Both location gets rotated by the cronjob.
+# Be aware that this log type is a performance killer.
+# As of 5.1 you can enable the log at runtime!
+#general_log_file        = /var/log/mysql/mysql.log
+#general_log             = 1
+#
+# Error log - should be very few entries.
+#
+# log_error = /var/log/mysql/error.log
+#
+# Here you can see queries with especially long duration
+#log_slow_queries   = /var/log/mysql/mysql-slow.log
+#long_query_time = 2
+#log-queries-not-using-indexes
+#
+# The following can be used as easy to replay backup logs or for replication.
+# note: if you are setting up a replication slave, see README.Debian about
+#       other settings you may need to change.
+#server-id      = 1
+#log_bin            = /var/log/mysql/mysql-bin.log
+expire_logs_days    = 10
+max_binlog_size         = 100M
+#binlog_do_db       = include_database_name
+#binlog_ignore_db   = include_database_name
+#
+# * InnoDB
+#
+# InnoDB is enabled by default with a 10MB datafile in /var/lib/mysql/.
+# Read the manual for more InnoDB related options. There are many!
+#
+# * Security Features
+#
+# Read the manual, too, if you want chroot!
+# chroot = /var/lib/mysql/
+#
+# For generating SSL certificates I recommend the OpenSSL GUI "tinyca".
+#
+# ssl-ca=/etc/mysql/cacert.pem
+# ssl-cert=/etc/mysql/server-cert.pem
+# ssl-key=/etc/mysql/server-key.pem
+
+
+
+[mysqldump]
+quick
+quote-names
+max_allowed_packet  = 16M
+
+[mysql]
+#no-auto-rehash # faster start of mysql but no tab completion
+default-character-set = utf8mb4
+[isamchk]
+key_buffer      = 16M
+
+#
+# * IMPORTANT: Additional settings that can override those from this file!
+#   The files must end with '.cnf', otherwise they'll be ignored.
+#
diff --git a/srcs/mysql/mysql.yaml b/srcs/mysql/mysql.yaml
index e97ef71..ead25b4 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/data
+      # volumes:
+      #   - name: mysql-volume
+      #     persistentVolumeClaim:
+      #       claimName: mysql-volume
 
 ---
 
@@ -44,17 +44,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
diff --git a/srcs/mysql/src/entrypoint.sh b/srcs/mysql/src/entrypoint.sh
deleted file mode 100755
index 8d7c1d1..0000000
--- a/srcs/mysql/src/entrypoint.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-mkdir -vp /run/mysqld
-
-# echo -e 'asdfasdf123\nasdfasdf123\n' | adduser cacharle
-
-# export MYSQL_ROOT_PASSWORD=''
-
-mysql_install_db --datadir=/usr/lib/data --user=root
-
-/usr/bin/mysqld --user=root --bootstrap <<EOF
-CREATE DATABASE wordpressdb;
-CREATE USER 'root'@'localhost' IDENTIFIED BY 'pass';
-GRANT ALL PRIVILEGES ON wordpressdb.* TO 'root'@'localhost';
-IDENTIFIED BY 'pass';
-FLUSH PRIVILEGES;
-EOF
-
-# until mysql; do
-# sleep 5
-
-exec /usr/bin/mysqld --user=root --console
diff --git a/srcs/mysql/src/my.cnf b/srcs/mysql/src/my.cnf
deleted file mode 100644
index 5517925..0000000
--- a/srcs/mysql/src/my.cnf
+++ /dev/null
@@ -1,4 +0,0 @@
-[mysqld]
-user=root
-port=3306
-datadir=/usr/lib/data
diff --git a/srcs/mysql/start.sh b/srcs/mysql/start.sh
new file mode 100755
index 0000000..bee0298
--- /dev/null
+++ b/srcs/mysql/start.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+mysql_install_db --user=root --ldata=/var/lib/mysql
+cat > /tmp/sql << eof
+CREATE DATABASE wordpress;
+FLUSH PRIVILEGES;
+GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY 'root' WITH GRANT OPTION;
+FLUSH PRIVILEGES;
+eof
+/usr/bin/mysqld --console --init_file=/tmp/sql