test

.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

mariadb-bashrc-launch.sh

@@ -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

mariadb.conf

@@ -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

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

mysqld.conf

@@ -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