From ec7bf9b4464719b4dc86cfeffcbf3e900235bac6 Mon Sep 17 00:00:00 2001
From: Jonathan <greenbigfrog@gmail.com>
Date: Mon, 5 Oct 2020 14:32:03 +0000
Subject: [PATCH] test

---
 .gitpod.Dockerfile       |  2 +-
 mariadb-bashrc-launch.sh | 17 -----------------
 mariadb.conf             | 10 ----------
 mysql.cnf                |  6 +++---
 mysqld.conf              | 10 ----------
 5 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 mariadb-bashrc-launch.sh
 delete mode 100644 mariadb.conf
 delete mode 100644 mysqld.conf

diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index a2479687..3a311d9b 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -11,7 +11,7 @@ RUN apt-get update \
 
 RUN ls /etc/mysql/mysql.conf.d/
 # Install our own MySQL config
-COPY mysql.cnf /etc/mysql/mysql.conf.d/mysqld.cnf
+COPY mysql.cnf /etc/mysql/my.cnf
 
 # Install default-login for MySQL clients
 COPY client.cnf /etc/mysql/mysql.conf.d/client.cnf
diff --git a/mariadb-bashrc-launch.sh b/mariadb-bashrc-launch.sh
deleted file mode 100644
index b8ab933a..00000000
--- a/mariadb-bashrc-launch.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-# this script is intended to be called from .bashrc
-# This is a workaround for not having something like supervisord
-
-if [ ! -e /var/run/mariadb/gitpod-init.lock ]
-then
-    touch /var/run/mariadb/gitpod-init.lock
-
-    # initialize database structures on disk, if needed
-    [ ! -d /workspace/mariadb ] && mariadb --initialize-insecure
-
-    # launch database, if not running
-    [ ! -e /var/run/mariadb/mariadb.pid ] && mariadb --daemonize
-
-    rm /var/run/mariadb/gitpod-init.lock
-fi
diff --git a/mariadb.conf b/mariadb.conf
deleted file mode 100644
index 46207438..00000000
--- a/mariadb.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[client]
-host     = localhost
-user     = root
-password =
-socket   = /var/run/mariadb/mariadb.sock
-[mariadb_upgrade]
-host     = localhost
-user     = root
-password =
-socket   = /var/run/mariadb/mariadb.sock
diff --git a/mysql.cnf b/mysql.cnf
index 46207438..12dcd7ad 100644
--- a/mysql.cnf
+++ b/mysql.cnf
@@ -2,9 +2,9 @@
 host     = localhost
 user     = root
 password =
-socket   = /var/run/mariadb/mariadb.sock
-[mariadb_upgrade]
+socket   = /var/run/mysqld/mysqld.sock
+[mysql_upgrade]
 host     = localhost
 user     = root
 password =
-socket   = /var/run/mariadb/mariadb.sock
+socket   = /var/run/mysqld/mysqld.sock
diff --git a/mysqld.conf b/mysqld.conf
deleted file mode 100644
index 46207438..00000000
--- a/mysqld.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-[client]
-host     = localhost
-user     = root
-password =
-socket   = /var/run/mariadb/mariadb.sock
-[mariadb_upgrade]
-host     = localhost
-user     = root
-password =
-socket   = /var/run/mariadb/mariadb.sock