diff --git a/docker-compose.yml b/docker-compose.yml index 0f8863a..e020594 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -379,7 +379,7 @@ services: IN_SYLVA_GRANT_TYPE: "password" IN_SYLVA_REALM: "in-sylva" ports: - - 8081:8080 + - 8081:8081 links: - gatekeeper - keycloak diff --git a/login/Dockerfile b/login/Dockerfile index 46018e7..be783fe 100644 --- a/login/Dockerfile +++ b/login/Dockerfile @@ -74,4 +74,6 @@ EXPOSE 8080 WORKDIR /app/in-sylva.user.login/ -CMD [ "pm2-runtime", "npm","--", "start" ] \ No newline at end of file +CMD [ "pm2-runtime", "npm","--", "start" ] + +# CMD npm run start \ No newline at end of file diff --git a/portal/.env b/portal/.env index f156d05..8b50c49 100644 --- a/portal/.env +++ b/portal/.env @@ -1,6 +1,7 @@ REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/gatekeeper REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/source-manager REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/keycloak +REACT_APP_IN_SYLVA_LOGIN_HOST=http://localhost:8081 REACT_APP_IN_SYLVA_CLIENT_ID=in-sylva.user.app REACT_APP_IN_SYLVA_GRANT_TYPE=password REACT_APP_IN_SYLVA_REALM=in-sylva diff --git a/portal/.env_generic b/portal/.env_generic index f156d05..8b50c49 100644 --- a/portal/.env_generic +++ b/portal/.env_generic @@ -1,6 +1,7 @@ REACT_APP_IN_SYLVA_GATEKEEPER_HOST=/gatekeeper REACT_APP_IN_SYLVA_SOURCE_MANAGER_HOST=/source-manager REACT_APP_IN_SYLVA_KEYCLOAK_HOST=/keycloak +REACT_APP_IN_SYLVA_LOGIN_HOST=http://localhost:8081 REACT_APP_IN_SYLVA_CLIENT_ID=in-sylva.user.app REACT_APP_IN_SYLVA_GRANT_TYPE=password REACT_APP_IN_SYLVA_REALM=in-sylva diff --git a/search/nginx/nginx.conf b/search/nginx/nginx.conf index d12d32c..a8ed38d 100644 --- a/search/nginx/nginx.conf +++ b/search/nginx/nginx.conf @@ -61,23 +61,23 @@ server { proxy_pass http://backend_search/; } - location /login/_next/static/ { - autoindex on; + # location /login/_next/static/ { + # autoindex on; # /app/in-sylva.user.login/.next/static/G-XKPGgjYNxek_SDdSj9a/pages - alias /app/in-sylva.user.login/.next/static; - } + # alias /app/in-sylva.user.login/.next/static; + #} - location /login/ { - proxy_pass http://login:8080/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - - sub_filter_once off; - proxy_set_header Accept-Encoding ""; - } + # location /login/ { + # proxy_pass http://login:8080/; + # proxy_http_version 1.1; + # proxy_set_header Upgrade $http_upgrade; + # proxy_set_header Connection 'upgrade'; + # proxy_set_header Host $host; + # proxy_cache_bypass $http_upgrade; + + # sub_filter_once off; + # proxy_set_header Accept-Encoding ""; + #} location /source-manager/ { diff --git a/search/nginx/nginx_generic.conf b/search/nginx/nginx_generic.conf index d12d32c..a8ed38d 100644 --- a/search/nginx/nginx_generic.conf +++ b/search/nginx/nginx_generic.conf @@ -61,23 +61,23 @@ server { proxy_pass http://backend_search/; } - location /login/_next/static/ { - autoindex on; + # location /login/_next/static/ { + # autoindex on; # /app/in-sylva.user.login/.next/static/G-XKPGgjYNxek_SDdSj9a/pages - alias /app/in-sylva.user.login/.next/static; - } + # alias /app/in-sylva.user.login/.next/static; + #} - location /login/ { - proxy_pass http://login:8080/; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection 'upgrade'; - proxy_set_header Host $host; - proxy_cache_bypass $http_upgrade; - - sub_filter_once off; - proxy_set_header Accept-Encoding ""; - } + # location /login/ { + # proxy_pass http://login:8080/; + # proxy_http_version 1.1; + # proxy_set_header Upgrade $http_upgrade; + # proxy_set_header Connection 'upgrade'; + # proxy_set_header Host $host; + # proxy_cache_bypass $http_upgrade; + + # sub_filter_once off; + # proxy_set_header Accept-Encoding ""; + #} location /source-manager/ {