Forward the port where Nginx is exposed to Django

Author: giohappy

docker/nginx/docker-entrypoint.sh

@@ -34,15 +34,26 @@ fi
 
 if [ -z "${HTTPS_HOST}" ]; then
         HTTP_SCHEME="http"
+        if [ $HTTP_PORT = "80" ]; then
+                PUBLIC_HOST=${HTTP_HOST}
+        else
+                PUBLIC_HOST="$HTTP_HOST:$HTTP_PORT"
+        fi
 else
         HTTP_SCHEME="https"
+        if [ $HTTPS_PORT = "443" ]; then
+                PUBLIC_HOST=${HTTPS_HOST}
+        else
+                PUBLIC_HOST="$HTTPS_HOST:$HTTPS_PORT"
+        fi
 fi
 
 export HTTP_SCHEME=${HTTP_SCHEME:-http}
 export GEONODE_LB_HOST_IP=${GEONODE_LB_HOST_IP:-django}
 export GEONODE_LB_PORT=${GEONODE_LB_PORT:-8000}
 export GEOSERVER_LB_HOST_IP=${GEOSERVER_LB_HOST_IP:-geoserver}
 export GEOSERVER_LB_PORT=${GEOSERVER_LB_PORT:-8080}
+export PUBLIC_HOST=${PUBLIC_HOST}
 
 defined_envs=$(printf '${%s} ' $(env | cut -d= -f1))
 
@@ -51,6 +62,7 @@ envsubst "$defined_envs" < /etc/nginx/nginx.conf.envsubst > /etc/nginx/nginx.con
 envsubst "$defined_envs" < /etc/nginx/nginx.https.available.conf.envsubst > /etc/nginx/nginx.https.available.conf
 envsubst "$defined_envs" < /etc/nginx/sites-enabled/geonode.conf.envsubst > /etc/nginx/sites-enabled/geonode.conf
 
+
 echo "Enabling or not https configuration"
 if [ -z "${HTTPS_HOST}" ]; then
         echo "" > /etc/nginx/nginx.https.enabled.conf

docker/nginx/geonode.conf.envsubst

@@ -106,8 +106,8 @@ location / {
   add_header Access-Control-Allow-Methods "GET, POST, PUT, PATCH, OPTIONS";
 
   proxy_redirect              off;
-  proxy_set_header            Host $host;
-  proxy_set_header            Origin $HTTP_SCHEME://$host;
+  proxy_set_header            Host $PUBLIC_HOST;
+  proxy_set_header            Origin $HTTP_SCHEME://$PUBLIC_HOST;
   proxy_set_header            X-Real-IP $remote_addr;
   proxy_set_header            X-Forwarded-Host $server_name;
   proxy_set_header            X-Forwarded-For $proxy_add_x_forwarded_for;