From 71d49c795b759f0fdbbd13e0ffc287a808b4354c Mon Sep 17 00:00:00 2001
From: Andrea Spacca <andrea.spacca@gmail.com>
Date: Sat, 23 Jul 2022 13:37:53 +0900
Subject: [PATCH] fix in handling nginx ports in docker compose

---
 configure-instance.sh             | 4 ++++
 template/docker-compose.nginx.yml | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/configure-instance.sh b/configure-instance.sh
index 71eb286..fab418f 100755
--- a/configure-instance.sh
+++ b/configure-instance.sh
@@ -20,6 +20,8 @@ frontend_port=$(echo "$frontend_url"| awk -F[/:] '{print $5}'| { read -d '' port
 backend_port=$(echo "$backend_url"| awk -F[/:] '{print $5}'| { read -d '' port; [ -z "$port" ] && { [ "$backend_schema" = "https" ] && echo "443" || echo "80"; } || echo "$port"; })
 proxy_port=$(echo "$proxy_url"| awk -F[/:] '{print $5}'| { read -d '' port; [ -z "$port" ] && { [ "$proxy_schema" = "https" ] && echo "443" || echo "80"; } || echo "$port"; })
 
+nginx_ports=$(printf "$frontend_port\n$backend_port\n$proxy_port\n"|uniq|while read -r port; do printf "            - \"$port:$port\"\\\n"; done)
+
 sed -i '' "s@FRONT_URL@$frontend_url@g" config/*
 sed -i '' "s@BACKEND_URL@$backend_url@g" config/*
 sed -i '' "s@PROXY_URL@$proxy_url@g" config/*
@@ -32,6 +34,8 @@ sed -i '' "s@FRONTEND_PORT@$frontend_port@g" config/*
 sed -i '' "s@BACKEND_PORT@$backend_port@g" config/*
 sed -i '' "s@PROXY_PORT@$proxy_port@g" config/*
 
+sed -i '' "s@NGINX_PORTS@$nginx_ports@g" config/*
+
 # The openj9 image does not support aarch64
 if [[ "$(uname -m)" == "aarch64" ]]; then
     sed -i '' "s/piped:latest/piped:hotspot/g" config/*
diff --git a/template/docker-compose.nginx.yml b/template/docker-compose.nginx.yml
index 1fe4915..128926c 100644
--- a/template/docker-compose.nginx.yml
+++ b/template/docker-compose.nginx.yml
@@ -39,9 +39,7 @@ services:
         image: nginx:mainline-alpine
         restart: unless-stopped
         ports:
-            - "FRONTEND_PORT:FRONTEND_PORT"
-            - "BACKEND_PORT:BACKEND_PORT"
-            - "PROXY_PORT:PROXY_PORT"
+NGINX_PORTS
         volumes:
             - ./config/nginx.conf:/etc/nginx/nginx.conf:ro
             - ./config/pipedapi.conf:/etc/nginx/conf.d/pipedapi.conf:ro