From 5bc12295a93a7272a2413c0074590ff5fffde322 Mon Sep 17 00:00:00 2001
From: uazo <29201891+uazo@users.noreply.github.com>
Date: Sun, 1 Aug 2021 19:05:27 +0200
Subject: [PATCH] move redis into goma-server

---
 .github/workflows/build_bromite.yaml | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/build_bromite.yaml b/.github/workflows/build_bromite.yaml
index 9af622b..3533c0e 100644
--- a/.github/workflows/build_bromite.yaml
+++ b/.github/workflows/build_bromite.yaml
@@ -138,22 +138,12 @@ jobs:
     needs: check_images
     if: success()
 
-    services:
-      redis:
-        image: redis
-        options: >-
-          --health-cmd "redis-cli ping"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        env:
-          REMOVEDOCKERSUPPORT: true
-          USELOCALIMAGE: true
-        
+    services:      
       gomaserver:
         image: uazo/goma-server
         volumes: 
           - /tmp/proxy:/tmp/proxy
+          - /redis:/var/lib/redis
         options: >-
           --health-cmd "hostname -I >/tmp/proxy/gomaserverip"
           --health-interval 30s
@@ -161,7 +151,6 @@ jobs:
           --health-retries 5
           
         env:
-          REDISHOST: redis
           REMOVEDOCKERSUPPORT: true
           USELOCALIMAGE: true
   
@@ -200,6 +189,10 @@ jobs:
           sudo chmod 777 $ARTIFACS_DIR
           rm -rf $ARTIFACS_DIR/*
           
+          # update hosts
+          #sudo echo "$(cat /tmp/proxy/gomaserverip | xargs) gomaserver" >/etc/hosts
+          #sudo echo "$(cat /tmp/proxy/redisip | xargs) redis" >/etc/hosts
+          
           # set goma options
           export SERVER_HOST_GOMA=$(cat /tmp/proxy/gomaserverip | xargs)
           export GOMA_SERVER_HOST=$SERVER_HOST_GOMA