From b1d866038676b88fc8b44392fbc16db3164b347b Mon Sep 17 00:00:00 2001
From: uazo <uazo@users.noreply.github.com>
Date: Tue, 10 Aug 2021 09:50:58 +0000
Subject: [PATCH] add pip proxy support

---
 images/github-runner/start-runner.sh | 36 +++++++++++++++++-----------
 images/squid/whitelist               |  3 +++
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/images/github-runner/start-runner.sh b/images/github-runner/start-runner.sh
index 2ac4c9d..21df5f9 100755
--- a/images/github-runner/start-runner.sh
+++ b/images/github-runner/start-runner.sh
@@ -1,36 +1,44 @@
 #!/bin/bash
 
-#docker stop gh-proxy
+docker stop gh-proxy
+
+GHRUNNERHOME=~/gh-runner
+sudo rm -rf $GHRUNNERHOME/tmp
 
 SYSBOX_UID=$(cat /etc/subuid | grep sysbox | cut -d : -f 2)
-mkdir -p /tmp/proxy
-mkdir -p /tmp/forward-proxy
-mkdir -p ~/redis
+mkdir -p $GHRUNNERHOME/tmp/proxy
+mkdir -p $GHRUNNERHOME/tmp/forward-proxy
+mkdir -p $GHRUNNERHOME/redis
 
-sudo chown $SYSBOX_UID:$SYSBOX_UID /tmp/proxy
-sudo chown $SYSBOX_UID:$SYSBOX_UID /tmp/forward-proxy
-sudo chown $SYSBOX_UID:$SYSBOX_UID ~/redis
+sudo chown $SYSBOX_UID:$SYSBOX_UID $GHRUNNERHOME/tmp/proxy
+sudo chown $SYSBOX_UID:$SYSBOX_UID $GHRUNNERHOME/tmp/forward-proxy
+sudo chown $SYSBOX_UID:$SYSBOX_UID $GHRUNNERHOME/redis
+#sudo chown $SYSBOX_UID:$SYSBOX_UID $GHRUNNERHOME/docker-inner
 
 docker run --rm -d --runtime=sysbox-runc \
   --name=gh-proxy \
   -e "REMOTEEXEC_ADDR=$REMOTEEXEC_ADDR" \
-  -v /tmp/proxy:/tmp/proxy:rw \
-  -v /tmp/forward-proxy:/tmp/forward-proxy:rw \
-  uazo/privoxy
+  -v $GHRUNNERHOME/tmp/proxy:/tmp/proxy:rw \
+  -v $GHRUNNERHOME/tmp/forward-proxy:/tmp/forward-proxy:rw \
+  uazo/squid
+
+docker logs gh-proxy
 
 while true
 do
+  #sudo chown -R $SYSBOX_UID:$SYSBOX_UID $GHRUNNERHOME/docker-inner
 
   docker run --runtime=sysbox-runc --name=gh-runner -ti --rm \
     --env-file=.env \
-    -v ~/docker-inner/:/var/lib/docker/:rw \
+    -v $GHRUNNERHOME/docker-inner/:/var/lib/docker/:rw \
     -v /storage/images:/storage/images:rw \
-    -v /tmp/proxy:/tmp/proxy:rw \
-    -v /tmp/forward-proxy:/tmp/forward-proxy:rw \
-    -v ~/redis:/redis:rw \
+    -v $GHRUNNERHOME/tmp/proxy:/tmp/proxy:rw \
+    -v $GHRUNNERHOME/tmp/forward-proxy:/tmp/forward-proxy:rw \
+    -v $GHRUNNERHOME/redis:/redis:rw \
     --network none \
     uazo/github-runner
 
+  echo "You can stop now"
   sleep 5s
 
 done
diff --git a/images/squid/whitelist b/images/squid/whitelist
index a7fb664..af5debe 100644
--- a/images/squid/whitelist
+++ b/images/squid/whitelist
@@ -14,3 +14,6 @@ chrome-infra-packages.appspot.com
 
 # for goma client
 #chrome-infra-packages.appspot.com
+
+# for pip
+.pypi.org