proxy ftp.cromite.org

.github/workflows/update_fdroid_repo.yaml

@@ -11,6 +11,8 @@ jobs:
        - name: Update fdroid repo
          shell: bash
          run: |
+            socat TCP-LISTEN:21,reuseaddr,fork UNIX-CLIENT:/tmp/proxy/ftp.sock &
+
             mkdir -p  ~/.config/rclone
             echo "${{ secrets.RCLONE_CONF }}" > ~/.config/rclone/rclone.conf
 

tools/images/github-runner/start-runner.sh

@@ -21,9 +21,9 @@ docker run --rm -d --runtime=sysbox-runc \
   -e "REMOTEEXEC_ADDR=$REMOTEEXEC_ADDR" \
   -v $GHRUNNERHOME/tmp/proxy:/tmp/proxy:rw \
   -v $GHRUNNERHOME/tmp/forward-proxy:/tmp/forward-proxy:rw \
-  uazo/squid
-
-docker logs gh-proxy
+  uazo/squid && \
+  docker logs gh-proxy && \
+  sleep 30s
 
 while true
 do

tools/images/squid/Dockerfile

@@ -1,12 +1,13 @@
 FROM ubuntu:latest
 
 COPY whitelist /etc/squid/whitelist
-COPY squid.conf /etc/squid/squid.conf
 COPY start-proxy.sh .
 
 ENV DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get install -y squid bash sudo socat
 
+COPY squid.conf /etc/squid/squid.conf
+
 CMD sudo chmod +x ./start-proxy.sh &&\
     ./start-proxy.sh

tools/images/squid/start-proxy.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+sudo apt update
+sudo apt upgrade
+
 echo Connect /tmp/forward-proxy/proxy.sock to 127.0.0.1:8118
 test -e /tmp/forward-proxy/proxy.sock && sudo rm /tmp/forward-proxy/proxy.sock
 socat UNIX-LISTEN:/tmp/forward-proxy/proxy.sock,reuseaddr,fork TCP:127.0.0.1:8118 &
@@ -10,4 +13,9 @@ test -e /tmp/proxy/bots.sock && sudo rm /tmp/proxy/bots.sock
 socat UNIX-LISTEN:/tmp/proxy/bots.sock,reuseaddr,fork TCP4:$REMOTEEXEC_ADDR &
 sudo chmod 777 /tmp/proxy/bots.sock
 
+echo Connect /tmp/proxy/ftp.sock to ftp.cromite.org
+test -e /tmp/proxy/ftp.sock && sudo rm /tmp/proxy/ftp.sock
+socat UNIX-LISTEN:/tmp/proxy/ftp.sock,reuseaddr,fork TCP4:ftp.cromite.org:21 &
+sudo chmod 777 /tmp/proxy/ftp.sock
+
 squid -N