diff --git a/Makefile b/Makefile index 353ffad1c..311ed3fbd 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ test_integration: setup start test_integration_master: setup start_master make wait_healthy_apps - docker run --network reviewer -e BASE_URL="reviewer_nginx_1:9000" $(BROWSERTEST_MASTER) + docker run --network reviewer -e BASE_URL="reviewer_nginx_1:9000" -e TEST_FIXTURE="Authentication" $(BROWSERTEST_MASTER) validate_chart: ${HELM} template ./charts/libero-reviewer --debug > /tmp/libero-reviewer.yaml diff --git a/config/proxy/nginx.conf b/config/proxy/nginx.conf index 3ee59d555..89d958162 100644 --- a/config/proxy/nginx.conf +++ b/config/proxy/nginx.conf @@ -23,7 +23,7 @@ http { } # @todo change to proxy once continuum-adaptor redirects - location /continuum-login { + location /auth-login { return 301 http://reviewer-mocks:3003/submit; # proxy_pass http://continuum-adaptor:3000/login; } diff --git a/config/proxy/nginx.localhost.conf b/config/proxy/nginx.localhost.conf index 67d4ba588..2eed044ba 100644 --- a/config/proxy/nginx.localhost.conf +++ b/config/proxy/nginx.localhost.conf @@ -21,9 +21,9 @@ http { location /auth/ { proxy_pass http://continuum-adaptor:3001/authenticate/; } - + # @todo change to proxy once continuum-adaptor redirects - location /continuum-login { + location /auth-login { return 301 http://localhost:3003/submit; # proxy_pass http://continuum-adaptor:3000/login; } diff --git a/docker-compose.master.yml b/docker-compose.master.yml index 6747f04d8..328ac1e28 100644 --- a/docker-compose.master.yml +++ b/docker-compose.master.yml @@ -10,7 +10,7 @@ services: image: liberoadmin/reviewer-submission:master-8181ba81-20200818.1239 client: - image: liberoadmin/reviewer-client:master-250f901b-20200723.1330 + image: liberoadmin/reviewer-client:master-83442ab0-20200827.0931 nginx: image: nginx:stable-alpine@sha256:8853c7e938c2aa5d9d7439e698f0e700f058df8414a83134a09fcbb68bb0707a