From baa80185e5b19e38339599f21ef16517438793f9 Mon Sep 17 00:00:00 2001
From: Tracey Jaquith <tracey@archive.org>
Date: Mon, 13 Jan 2025 22:58:07 -0800
Subject: [PATCH] http proxy tweaks

---
 bin/entrypoint.sh | 5 +++++
 install.sh        | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/bin/entrypoint.sh b/bin/entrypoint.sh
index e8f6677..aa3ecd8 100755
--- a/bin/entrypoint.sh
+++ b/bin/entrypoint.sh
@@ -16,4 +16,9 @@ podman system service -t 0 & # xxx prolly add into supervisord for autorestart
 # test
 # sudo curl -v -s --unix-socket /run/podman/podman.sock http://d/v1.0.0/libpod/info
 
+
+# 'caddy' and 'consul' need to talk to backend 'reverse_proxy' [IP]:[PORT] URLs directly and not
+# over any http proxy
+unset  HTTPS_PROXY  HTTP_PROXY  https_proxy  http_proxy
+
 exec /usr/bin/supervisord -n -c /etc/supervisor/supervisord.conf
diff --git a/install.sh b/install.sh
index c760dd4..fd05d64 100755
--- a/install.sh
+++ b/install.sh
@@ -43,9 +43,9 @@ if [ $HOST_UNAME = Darwin ]; then
 else
   PV=/pv
   # Use host characteristics
-  # Avoid HTTP(S)_PROXY vars automatically "leaking" in to built or run container image
-  ARGS_MISC="--net=host --cgroupns=host --http-proxy=false"
-  ARGS_INIT="$ARGS_MISC"
+  ARGS_MISC="--net=host --cgroupns=host"
+  # Avoid HTTP(S)_PROXY vars automatically "leaking" in to the built container image
+  ARGS_INIT="$ARGS_MISC --http-proxy=false"
   ARGS_RUN="$ARGS_MISC $ARGS_RUN"
 fi