From 8b8213a3b7b6ee979a2dfe64bbe7ee66e57056bb Mon Sep 17 00:00:00 2001
From: Ulf Gebhardt <ulf.gebhardt@webcraft-media.de>
Date: Tue, 25 Jan 2022 16:50:06 +0100
Subject: [PATCH] try some docker compose fixes

---
 .github/workflows/test.yml | 6 +++---
 docker-compose.test.yml    | 9 ---------
 docker-compose.yml         | 2 +-
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 49a9fa9be..264bc2e21 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -510,9 +510,9 @@ jobs:
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
       - name: backend | docker-compose database
         run: docker-compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps database
-      - name: Sleep for 30 seconds
-        run: sleep 30s
-        shell: bash
+      #- name: Sleep for 30 seconds
+      #  run: sleep 30s
+      #  shell: bash
       - name: backend Unit tests | test
         run: cd database && yarn && yarn build && cd ../backend && yarn && yarn CI_worklfow_test
         # run: docker-compose -f docker-compose.yml -f docker-compose.test.yml exec -T backend yarn test
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index e7b0e9849..4f095b24f 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -26,18 +26,9 @@ services:
   ## MARIADB ##############################################
   #########################################################
   mariadb:
-    build:
-      context: .
-      dockerfile: ./mariadb/Dockerfile
-      target: mariadb_server
-    environment:
-      - MARIADB_ALLOW_EMPTY_PASSWORD=1
-      - MARIADB_USER=root
     networks: 
       - internal-net
       - external-net
-    ports: 
-      - 3306:3306
     volumes: 
       - db_test_vol:/var/lib/mysql
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 1d449fcea..389fd2582 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -108,7 +108,7 @@ services:
   # DATABASE #############################################
   ########################################################
   database:
-    image: gradido/database:production_up
+    #image: gradido/database:production_up
     build:
       context: ./database
       target: production_up