From 164fa1840f968edc884a91e19d280d18b0598b7d Mon Sep 17 00:00:00 2001
From: Marcello Teodori <151025+mteodori@users.noreply.github.com>
Date: Sat, 5 Dec 2020 13:11:05 +0100
Subject: [PATCH] AAE-4262 fix docker redirect with relative url (#6426)
---
docker/default.conf.template | 6 ++++--
docker/run.sh | 8 +++++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/docker/default.conf.template b/docker/default.conf.template
index a85f322637..36bb7fdfe1 100644
--- a/docker/default.conf.template
+++ b/docker/default.conf.template
@@ -5,8 +5,10 @@ server {
#charset koi8-r;
#access_log /var/log/nginx/host.access.log main;
- root /usr/share/nginx/html;
- rewrite ^([^.]*[^/])$ $1/ permanent;
+ root /usr/share/nginx/html;
+
+ rewrite ^([^.]*[^/])$ $1/ permanent;
+ absolute_redirect off;
location ${BASE_PATH} {
set $EVAL_BASE_PATH "${BASE_PATH}";
diff --git a/docker/run.sh b/docker/run.sh
index 814ebf4bde..81b0c0bda3 100755
--- a/docker/run.sh
+++ b/docker/run.sh
@@ -2,10 +2,13 @@
set -e
+HOST_PORT=8081
+CONTAINER_PORT=8080
docker rmi -f $DOCKER_IMAGE_REPO
docker build --build-arg PROJECT_NAME=$PROJECT_NAME -t $DOCKER_IMAGE_REPO .
-echo http://localhost:8080$BASE_PATH
+echo "http://localhost:${HOST_PORT}${BASE_PATH}"
docker run --rm -it \
+ --env BASE_PATH=$BASE_PATH \
--env APP_CONFIG_AUTH_TYPE=$APP_CONFIG_AUTH_TYPE \
--env APP_CONFIG_IDENTITY_HOST=$APP_CONFIG_IDENTITY_HOST \
--env APP_CONFIG_OAUTH2_HOST=$APP_CONFIG_OAUTH2_HOST \
@@ -17,5 +20,4 @@ docker run --rm -it \
--env APP_CONFIG_OAUTH2_REDIRECT_LOGOUT=$APP_CONFIG_OAUTH2_REDIRECT_LOGOUT \
--env APP_CONFIG_BPM_HOST=$APP_CONFIG_BPM_HOST \
--env APP_CONFIG_ECM_HOST=$APP_CONFIG_ECM_HOST \
- --env BASE_PATH=$BASE_PATH \
- --user 1000:1000 --publish 8080:8080 $DOCKER_IMAGE_REPO
+ --user 1000:1000 --publish $HOST_PORT:$CONTAINER_PORT $DOCKER_IMAGE_REPO