fix ui redirects from docker

kanton-bern · Jan 18, 2024 · c152347 · c152347
1 parent b27a992
commit c152347
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 129 deletions.
diff --git a/hello-data-deployment/docker-compose/base/base-services.yaml b/hello-data-deployment/docker-compose/base/base-services.yaml
@@ -495,7 +495,7 @@ services:
 
   hello-data-portal-ui:
     build:
-      context: base/hello-data-portal-ui
+      context: base/portal
       dockerfile: Dockerfile
       args:
         HELLO_DATA_AUTH_SERVER_URL: ${HELLO_DATA_AUTH_SERVER_URL}

diff --git a/hello-data-deployment/docker-compose/base/hello-data-portal-ui/nginx.conf b/hello-data-deployment/docker-compose/base/hello-data-portal-ui/nginx.conf
diff --git a/...pose/base/hello-data-portal-ui/Dockerfile → ...ent/docker-compose/base/portal/Dockerfile b/...pose/base/hello-data-portal-ui/Dockerfile → ...ent/docker-compose/base/portal/Dockerfile
@@ -69,8 +69,6 @@ RUN echo "window.environment = { \
             } \
           }" > /app/config/environment.js
 
-COPY nginx.conf /etc/nginx/nginx.conf
-
 RUN chown -R nginx: /app
 
 EXPOSE 80

diff --git a/hello-data-portal/hello-data-portal-ui/build/docker/Dockerfile b/hello-data-portal/hello-data-portal-ui/build/docker/Dockerfile
@@ -25,12 +25,12 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-FROM nginx:1
+FROM nginx:1.25.3
 
 LABEL MAINTAINER="HelloDATA Team"
 
 COPY hello-data-portal-ui /app
-
+RUN rm -rf /etc/nginx/conf.d/default.conf
 COPY nginx.conf /etc/nginx/nginx.conf
 COPY csp.conf /etc/nginx/conf.d/csp.conf.template
 

diff --git a/hello-data-portal/hello-data-portal-ui/build/docker/nginx.conf b/hello-data-portal/hello-data-portal-ui/build/docker/nginx.conf
@@ -92,6 +92,10 @@ http {
   # X-XSS-Protection
   add_header X-XSS-Protection "1; mode=block";
 
+  proxy_set_header Host $host;
+  proxy_set_header X-Real-IP $remote_addr;
+  proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
   server {
     listen 127.0.0.1:80;
     server_name 127.0.0.1;
@@ -107,10 +111,16 @@ http {
     client_max_body_size 1024m;
     index index.html index.htm;
 
+    location = / {
+      absolute_redirect off;
+      rewrite ^/$ /app/ redirect;
+      try_files $uri $uri/ @app;
+    }
+
     location @app {
       rewrite ^$ /app/ redirect;
       rewrite ^/$ /app/ redirect;
-      rewrite ^/app$ index.html;
+      rewrite ^/app$ /index.html;
       rewrite ^/app.*$ /index.html;
       try_files $uri $uri/ /index.html;
     }