bump to alpine 3.16

edgd1er · edgd1er · commit 04e033262ae7 · 2022-06-02T13:24:34.000+02:00
diff --git a/.github/workflows/buildPush.yml b/.github/workflows/buildPush.yml
@@ -67,6 +67,7 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           context: .
+          build-args: VER=3.16
           file: ./Dockerfile
           platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
           push: ${{env.DOCKER_PUSH }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM alpine:3.15
+ARG VER=3.15.2
+FROM alpine:${VER}
 LABEL maintainer=edgd1er
 
 ENV OVPN_CONFIG_DIR="/app/openvpn/config" \
diff --git a/README.md b/README.md
@@ -99,7 +99,7 @@ services:
       - OPENVPN_PARAMETERS= #optional, empty by default, overrides openvpn config file with parameters
       - OPENVPN_LOGLEVEL= #Optional, define openvpn verbose level 0-9
       - EXIT_WHEN_IP_NOTASEXPECTED=0 # when detected ip is not belonging to remote vpn network
-      - LOCAL_NETWORK=192.168.53.0/24
+      - LOCAL_NETWORK=192.168.0.0/24 # allow network access for socks and tinyproxy.
       - TINYPORT=8888 #define tinyport inside the container, optional, 8888 by default,
       - TINY_LOGLEVEL=Error #Critical (least verbose), Error, Warning, Notice, Connect (to log connections without Info's noise), Info
       - DANTE_LOGLEVEL="error" #Optional, error by default, available values: connect disconnect error data
diff --git a/tests.sh b/tests.sh
@@ -7,28 +7,32 @@ SOCK_PORT=1081
 FAILED=0
 INTERVAL=4
 
-#Main
-echo "Building and starting image"
-docker compose -f docker-compose.yml up -d --build
-echo "Waiting for the container to be up.(every ${INTERVAL} sec)"
-logs=""
-while [ 0 -eq $(echo $logs| grep -c "Initialization Sequence Completed") ]
-do
-  logs="$(docker compose logs)"
-  sleep ${INTERVAL}
-  ((n++))
-  echo "loop: ${n}"
-  [[ ${n} -eq 15 ]] && break ||true
-done
-
-
-docker compose logs
+#Functions
+
+buildAndWait() {
+  echo "Stopping and removing running containers"
+  docker compose down -v
+  echo "Building and starting image"
+  docker compose -f docker-compose.yml up -d --build
+  echo "Waiting for the container to be up.(every ${INTERVAL} sec)"
+  logs=""
+  while [ 0 -eq $(echo $logs | grep -c "Initialization Sequence Completed") ]; do
+    logs="$(docker compose logs)"
+    sleep ${INTERVAL}
+    ((n++))
+    echo "loop: ${n}"
+    [[ ${n} -eq 15 ]] && break || true
+  done
+  docker compose logs
+}
 
+#Main
+[[ "localhost" == ${PROXY_HOST} ]] && buildAndWait
 for PORT in ${HTTP_PORT} ${SOCK_PORT}; do
   msg="Test connection to port ${PORT}: "
   if [ 0 -eq $(echo "" | nc -v -q 2 ${PROXY_HOST} ${PORT} 2>&1 | grep -c "] succeeded") ]; then
     msg+=" Failed"
-    ((FAILED+=1))
+    ((FAILED += 1))
   else
     msg+=" OK"
   fi
@@ -40,15 +44,15 @@ if [[ $? -eq 0 ]]; then
   echo "IP is ${IP}"
 else
   echo "curl through http proxy to https://ifconfig.me/ip failed"
-  ((FAILED+=1))
+  ((FAILED += 1))
 fi
 
 IP=$(curl -sqx socks5://${PROXY_HOST}:${SOCK_PORT} "https://ifconfig.me/ip")
 if [[ $? -eq 0 ]]; then
   echo "IP is ${IP}"
 else
   echo "curl through socks proxy to https://ifconfig.me/ip failed"
-  ((FAILED+=1))
+  ((FAILED += 1))
 fi
 
 docker compose down
