From c1bc74635fca794d5bf6bee2ebae0a55773ddc3b Mon Sep 17 00:00:00 2001
From: Andrew Bastin <andrewbastin.k@gmail.com>
Date: Tue, 29 Oct 2024 00:05:52 +0530
Subject: [PATCH] feat: ability for aio in sub-path access configurations to
 specify alternate ports (#4480)

---
 aio-multiport-setup.Caddyfile |  4 ----
 aio-subpath-access.Caddyfile  | 14 +-------------
 prod.Dockerfile               |  2 ++
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/aio-multiport-setup.Caddyfile b/aio-multiport-setup.Caddyfile
index 05c659894..6140f464e 100644
--- a/aio-multiport-setup.Caddyfile
+++ b/aio-multiport-setup.Caddyfile
@@ -18,7 +18,3 @@
 :3170 {
 	reverse_proxy localhost:8080
 }
-
-:80 {
-	respond 404
-}
diff --git a/aio-subpath-access.Caddyfile b/aio-subpath-access.Caddyfile
index 356a656a4..7318eecd2 100644
--- a/aio-subpath-access.Caddyfile
+++ b/aio-subpath-access.Caddyfile
@@ -3,19 +3,7 @@
   persist_config off
 }
 
-:3000 {
-	respond 404
-}
-
-:3100 {
-	respond 404
-}
-
-:3170 {
-	reverse_proxy localhost:8080
-}
-
-:80 {
+:{$HOPP_AIO_ALTERNATE_PORT:80} {
 	# Serve the `selfhost-web` SPA by default
 	root * /site/selfhost-web
 	file_server
diff --git a/prod.Dockerfile b/prod.Dockerfile
index 9b8464a65..e4386c8ea 100644
--- a/prod.Dockerfile
+++ b/prod.Dockerfile
@@ -130,6 +130,8 @@ HEALTHCHECK --interval=2s CMD /bin/sh /healthcheck.sh
 WORKDIR /dist/backend
 
 CMD ["node", "/usr/src/app/aio_run.mjs"]
+
+# NOTE: Although these ports are exposed, the HOPP_ALTERNATE_AIO_PORT variable can be used to assign a user-specified port
 EXPOSE 3170
 EXPOSE 3000
 EXPOSE 3100