inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-12 17:04:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

AAE-4262 fix docker redirect with relative url (#6426)

Browse Source
This commit is contained in:
Marcello Teodori 2020-12-05 13:11:05 +01:00 committed by GitHub
parent 577fa1b514
commit 164fa1840f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docker/default.conf.template
View File

@ -5,8 +5,10 @@ server {
#charset koi8-r; #charset koi8-r;
#access_log /var/log/nginx/host.access.log main; #access_log /var/log/nginx/host.access.log main;
root /usr/share/nginx/html; root /usr/share/nginx/html;
rewrite ^([^.]*[^/])$ $1/ permanent;
rewrite ^([^.]*[^/])$ $1/ permanent;
absolute_redirect off;
location ${BASE_PATH} { location ${BASE_PATH} {
set $EVAL_BASE_PATH "${BASE_PATH}"; set $EVAL_BASE_PATH "${BASE_PATH}";

8
docker/run.sh
View File

@ -2,10 +2,13 @@
set -e set -e
HOST_PORT=8081
CONTAINER_PORT=8080
docker rmi -f $DOCKER_IMAGE_REPO docker rmi -f $DOCKER_IMAGE_REPO
docker build --build-arg PROJECT_NAME=$PROJECT_NAME -t $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 \ docker run --rm -it \
--env BASE_PATH=$BASE_PATH \
--env APP_CONFIG_AUTH_TYPE=$APP_CONFIG_AUTH_TYPE \ --env APP_CONFIG_AUTH_TYPE=$APP_CONFIG_AUTH_TYPE \
--env APP_CONFIG_IDENTITY_HOST=$APP_CONFIG_IDENTITY_HOST \ --env APP_CONFIG_IDENTITY_HOST=$APP_CONFIG_IDENTITY_HOST \
--env APP_CONFIG_OAUTH2_HOST=$APP_CONFIG_OAUTH2_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_OAUTH2_REDIRECT_LOGOUT=$APP_CONFIG_OAUTH2_REDIRECT_LOGOUT \
--env APP_CONFIG_BPM_HOST=$APP_CONFIG_BPM_HOST \ --env APP_CONFIG_BPM_HOST=$APP_CONFIG_BPM_HOST \
--env APP_CONFIG_ECM_HOST=$APP_CONFIG_ECM_HOST \ --env APP_CONFIG_ECM_HOST=$APP_CONFIG_ECM_HOST \
--env BASE_PATH=$BASE_PATH \ --user 1000:1000 --publish $HOST_PORT:$CONTAINER_PORT $DOCKER_IMAGE_REPO
--user 1000:1000 --publish 8080:8080 $DOCKER_IMAGE_REPO