From 54a048de6e4a86e8312ac3e696ec7faad30a1d79 Mon Sep 17 00:00:00 2001
From: uazo <29201891+uazo@users.noreply.github.com>
Date: Fri, 30 Jul 2021 09:30:54 +0200
Subject: [PATCH] Add proxy support

---
 .github/workflows/build_bromite.yaml | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_bromite.yaml b/.github/workflows/build_bromite.yaml
index 1543814..bea80fd 100644
--- a/.github/workflows/build_bromite.yaml
+++ b/.github/workflows/build_bromite.yaml
@@ -17,6 +17,7 @@ on:
 env:
   BROMITE_SHA: 76745fde6ed75542f005ea5528f486df41c56da4
   REMOVEDOCKERSUPPORT: true
+  USELOCALIMAGE: true
 
 jobs:
   check_images:
@@ -129,8 +130,6 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-        env:
-          REMOVEDOCKERSUPPORT: true
       gomaserver:
         image: uazo/goma-server
         #ports: 
@@ -140,19 +139,27 @@ jobs:
         env:
           REDISHOST: redis
           REMOTEEXEC_ADDR: ${{ secrets.REMOTEEXEC_ADDR }}
-          REMOVEDOCKERSUPPORT: true
           
     container:
       image: uazo/bromite-build:76745fde6ed75542f005ea5528f486df41c56da4 #${{ env.BROMITE_SHA }}
       env:
         SERVER_HOST_GOMA: gomaserver
-        USELOCALIMAGE: true
-        REMOVEDOCKERSUPPORT: true
       volumes:
         - /storage/bromite/${{ github.sha }}:/home/lg/working_dir/artifacs
         - /tmp/proxy:/tmp/proxy
 
     steps:
+      - name: Get current proxy settings
+        shell: bash
+        run: |
+          if ! [[ -z "${HTTP_PROXY}" ]]; then
+            PROXY_ADDR=http://$(hostname -I | xargs):8118
+            echo "HTTP_PROXY=$PROXY_ADDR" >> $GITHUB_ENV
+            echo "HTTPS_PROXY=$PROXY_ADDR" >> $GITHUB_ENV
+            echo "http_proxy=$PROXY_ADDR" >> $GITHUB_ENV
+            echo "https_proxy=$PROXY_ADDR" >> $GITHUB_ENV
+          fi
+      
       - name: Build Bromite
         shell: bash
         env: