From 4e0783fc8ee2d64c4dd48a9bd35698923cb826e7 Mon Sep 17 00:00:00 2001
From: einhornimmond <info@einhornimmond.de>
Date: Thu, 8 May 2025 18:20:15 +0200
Subject: [PATCH] use mariadb in another docker for ci test

---
 .github/workflows/test_deploy.yml |  9 ++-------
 deployment/bare_metal/Dockerfile  | 16 ++--------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/test_deploy.yml b/.github/workflows/test_deploy.yml
index 926721165..b1261963e 100644
--- a/.github/workflows/test_deploy.yml
+++ b/.github/workflows/test_deploy.yml
@@ -31,10 +31,5 @@ jobs:
       - name: docker-compose mariadb
         run: docker compose -f docker-compose.yml -f docker-compose.test.yml up --detach --no-deps mariadb
 
-      - name: run install script, which will run start.sh
-        run: |
-          cd deployment/hetzner_cloud
-          sudo ./install.sh ${{ github.ref_name }}
-
-      #- name: Deploy Bare Metal | Build image
-      # run: docker build -f ./deployment/bare_metal/Dockerfile --build-arg BRANCH_NAME=${{ github.ref_name }} -t "gradido/deploy-bare-metal:local" .
+      - name: Deploy Bare Metal | Build image
+        run: docker build --network host -f ./deployment/bare_metal/Dockerfile --build-arg BRANCH_NAME=${{ github.ref_name }} -t "gradido/deploy-bare-metal:local" .
diff --git a/deployment/bare_metal/Dockerfile b/deployment/bare_metal/Dockerfile
index 834686759..2010671be 100644
--- a/deployment/bare_metal/Dockerfile
+++ b/deployment/bare_metal/Dockerfile
@@ -68,20 +68,10 @@ RUN npm i -g yarn
 # Install pm2
 RUN npm i -g pm2 && pm2 startup
 
-# create db user
-ENV DB_USER=gradido
-RUN DB_PASSWORD=$(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c 32)
-ENV DB_PASSWORD=$DB_PASSWORD
-
-RUN 
-RUN service mariadb start && mysql <<EOFMYSQL
-    CREATE USER IF NOT EXISTS '$DB_USER'@'localhost' IDENTIFIED BY '$DB_PASSWORD';
-    GRANT ALL PRIVILEGES ON *.* TO '$DB_USER'@'localhost';
-    FLUSH PRIVILEGES;
-EOFMYSQL
-
 WORKDIR /app/gradido
 # Configure database
+RUN DB_USER=gradido
+RUN DB_PASSWORD=
 RUN envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < database/.env.template > database/.env
 
 # Configure backend
@@ -106,8 +96,6 @@ RUN envsubst "$(env | sed -e 's/=.*//' -e 's/^/\$/g')" < federation/.env.templat
 ###########################################################################################
 FROM install as start
 
-RUN /etc/init.d/mariadb start
-
 WORKDIR /app/gradido/deployment/bare_metal
 
 # mock sudo