From c66d752741387a2f2e6a8158eb2e1bee0c1b5506 Mon Sep 17 00:00:00 2001
From: snheffer <61468112+snheffer@users.noreply.github.com>
Date: Thu, 12 Jun 2025 21:20:35 +0100
Subject: [PATCH] remove tunnel timeout configuration as not used. remove
 reference from readme. revert to project defaults for server and client
 timeout.

---
 Dockerfile           | 6 ++----
 README.md            | 5 ++---
 docker-entrypoint.sh | 1 -
 haproxy.cfg          | 1 -
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c58f579..8b522d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -34,9 +34,7 @@ ENV ALLOW_RESTARTS=0 \
     TIMEOUT_HTTP_REQUEST=10s \
     TIMEOUT_QUEUE=1m \
     TIMEOUT_CONNECT=10s \
-    TIMEOUT_CLIENT=50s \
-    TIMEOUT_SERVER=50s \
-    TIMEOUT_TUNNEL=3600s
-
+    TIMEOUT_CLIENT=10m \
+    TIMEOUT_SERVER=10m
 COPY docker-entrypoint.sh /usr/local/bin/
 COPY haproxy.cfg /usr/local/etc/haproxy/haproxy.cfg.template
diff --git a/README.md b/README.md
index 70a4f71..07eb04d 100644
--- a/README.md
+++ b/README.md
@@ -150,9 +150,8 @@ The Docker Socket Proxy allows configuration of various timeouts using environme
 - [`TIMEOUT_HTTP_REQUEST`](https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/#timeout%20http-request): Maximum time to wait for a complete HTTP request. Default is `10s`.
 - [`TIMEOUT_QUEUE`](https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/#timeout%20queue): Maximum time a request can remain in the queue. Default is `1m`.
 - [`TIMEOUT_CONNECT`](https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/#timeout%20connect): Maximum time to wait for a connection attempt to a backend server. Default is `10s`.
-- [`TIMEOUT_CLIENT`](https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/#timeout%20client): Maximum inactivity time on the client side. Default is `50s`.
-- [`TIMEOUT_SERVER`](https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/#timeout%20server): Maximum inactivity time on the server side. Default is `50s`.
-- [`TIMEOUT_TUNNEL`](https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/#timeout%20tunnel): Maximum inactivity time for a tunnel connection. Default is `3600s` (1 hour).
+- [`TIMEOUT_CLIENT`](https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/#timeout%20client): Maximum inactivity time on the client side. Default is `10m`.
+- [`TIMEOUT_SERVER`](https://www.haproxy.com/documentation/haproxy-configuration-manual/latest/#timeout%20server): Maximum inactivity time on the server side. Default is `10m`.
 
 To set these timeouts, you can pass them as environment variables when starting the Docker container. For example:
 
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 75dbc18..5806c69 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -21,7 +21,6 @@ sed -e "s|\${BIND_CONFIG}|$BIND_CONFIG|g" \
     -e "s|\${TIMEOUT_CONNECT}|$TIMEOUT_CONNECT|g" \
     -e "s|\${TIMEOUT_CLIENT}|$TIMEOUT_CLIENT|g" \
     -e "s|\${TIMEOUT_SERVER}|$TIMEOUT_SERVER|g" \
-    -e "s|\${TIMEOUT_TUNNEL}|$TIMEOUT_TUNNEL|g" \
     /usr/local/etc/haproxy/haproxy.cfg.template > /usr/local/etc/haproxy/haproxy.cfg
 
 # first arg is `-f` or `--some-option`
diff --git a/haproxy.cfg b/haproxy.cfg
index f3ce1ca..52c2d6f 100644
--- a/haproxy.cfg
+++ b/haproxy.cfg
@@ -20,7 +20,6 @@ defaults
     timeout connect ${TIMEOUT_CONNECT}
     timeout client ${TIMEOUT_CLIENT}
     timeout server ${TIMEOUT_SERVER}
-    timeout tunnel ${TIMEOUT_TUNNEL}
     timeout http-keep-alive 10s
     timeout check 10s
     maxconn 3000