From 9ee72fb8f22396d66cfb6f6413177c02994b9616 Mon Sep 17 00:00:00 2001
From: einhornimmond <dario.rekowski@gmx.de>
Date: Thu, 18 Feb 2021 13:27:19 +0100
Subject: [PATCH] add phpmyadmin for db debugging, fix mariadb code, insert use
 table at beginning of sql files

---
 docker-compose.override.yml | 15 +++++++++++++++
 docker-compose.yml          |  3 +--
 mariadb/Dockerfile          |  7 ++++---
 mariadb/setup_dbs.sh        | 10 ----------
 4 files changed, 20 insertions(+), 15 deletions(-)
 delete mode 100644 mariadb/setup_dbs.sh

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index f5f0ac3dd..5b0f43408 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -65,6 +65,21 @@ services:
     volumes: 
       - ./logs:/var/log/nginx 
   
+  ## for debugging mariadb
+  phpmyadmin:
+    image: phpmyadmin
+    container_name: phpmyadmin
+    environment:
+     - PMA_ARBITRARY=1
+    restart: always
+    ports:
+     - 8080:80
+    networks: 
+     - internal-net
+     - external-net
+    volumes:
+     - /sessions
+  
   #  image: ocelotsocialnetwork/backend:development
   #  build:
   #    target: development
diff --git a/docker-compose.yml b/docker-compose.yml
index fe7b940fc..aa44a9168 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -45,8 +45,7 @@ services:
     container_name: mariadb
     environment:
       - MARIADB_ALLOW_EMPTY_PASSWORD=1
-      - MARIADB_USER='root'
-      - MARIADB_DATABASE='gradido_login'
+      - MARIADB_USER=root
     networks: 
       - internal-net
     ports: 
diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile
index b04e68709..ef2f35a46 100644
--- a/mariadb/Dockerfile
+++ b/mariadb/Dockerfile
@@ -29,11 +29,12 @@ WORKDIR ${DOCKER_WORKDIR}
 COPY ./mariadb/setup_dbs.sql a_setup_dbs.sql 
 # login server db
 COPY ./login_server/skeema/ .
-RUN cd ./gradido_login/ && for f in *.sql; do cp -- "$f" "../b_$f"; done
+RUN cd ./gradido_login/ && for f in *.sql; do cp -- "$f" "../b_$f"; sed  -i '1i use gradido_login;' "../b_$f"; done
 # community server db
 COPY ./community_server/skeema/ . 
-RUN cd ./gradido_community/ && for f in *.sql; do cp -- "$f" "../c_$f"; done
-RUN cd ./gradido_community/insert && for f in *.sql; do cp -- "$f" "../../d_$f"; done
+RUN cd ./gradido_community/ && for f in *.sql; do cp -- "$f" "../d_$f"; sed  -i '1i use gradido_community;' "../d_$f"; done
+RUN cd ./gradido_community/insert && for f in *.sql; do cp -- "$f" "../../e_$f";  sed  -i '1i use gradido_community;' "../../e_$f"; done
+
 RUN ls -ls 
 
 
diff --git a/mariadb/setup_dbs.sh b/mariadb/setup_dbs.sh
deleted file mode 100644
index 72ac6a5f7..000000000
--- a/mariadb/setup_dbs.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-create database gradido_login 
-		DEFAULT CHARACTER SET utf8mb4
-		DEFAULT COLLATE utf8mb4_unicode_ci;
-    create database IF NOT EXISTS _skeema_tmp
-		DEFAULT CHARACTER SET utf8mb4
-		DEFAULT COLLATE utf8mb4_unicode_ci;
-    CREATE USER '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASSWD';
-	GRANT ALL PRIVILEGES ON gradido_login.* TO '$DB_USER'@'localhost';
-	GRANT ALL PRIVILEGES ON _skeema_tmp.* TO '$DB_USER'@'localhost';
-	FLUSH PRIVILEGES;
\ No newline at end of file