Removed references to context path until it's supported.

ludomikula · ludomikula · commit f3370ba093b8 · 2023-01-10T10:36:17.000+01:00
diff --git a/deploy/docker/Dockerfile.frontend b/deploy/docker/Dockerfile.frontend
@@ -6,7 +6,7 @@ RUN yarn --immutable
 ARG REACT_APP_COMMIT_ID=test
 ARG REACT_APP_ENV=production
 ARG REACT_APP_EDITION=community
-RUN PUBLIC_URL="." yarn build
+RUN yarn build
 
 FROM nginx:alpine-slim
 LABEL maintainer="openblocks"
diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml
@@ -27,7 +27,6 @@ services:
     environment:
       UID: "9001"
       GID: "9001"
-      #CONTEXT_PATH: "/"
       MONGODB_URI: "mongodb://openblocks:secret123@mongodb/openblocks?authSource=admin"
       REDIS_URL: "redis://redis:6379"
       ENCRYPTION_PASSWORD: "openblocks.dev"
@@ -46,7 +45,6 @@ services:
     environment:
       UID: "9001"
       GID: "9001"
-      #CONTEXT_PATH: "/"
       OPENBLOCKS_SERVER_URL: "http://openblocks-backend:8080"
     restart: unless-stopped
     depends_on:
diff --git a/deploy/docker/frontend/nginx.conf b/deploy/docker/frontend/nginx.conf
@@ -34,27 +34,27 @@ http {
         root /openblocks-client;
 
 
-        location __CONTEXT_PATH__ {
+        location / {
             try_files $uri /index.html;
 
             if ($request_filename ~* .*.(html|htm)$) {
                 add_header Cache-Control no-cache;
             }
         }
 
-        location __CONTEXT_PATH__/api {
+        location /api {
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_set_header X-Forwarded-Host $host;
             proxy_pass __OPENBLOCKS_SERVER_URL__;
         }
 
-        location __CONTEXT_PATH__/oauth2 {
+        location /oauth2 {
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_set_header X-Forwarded-Host $host;
             proxy_pass __OPENBLOCKS_SERVER_URL__;
         }
 
-        location __CONTEXT_PATH__/login {
+        location /login {
             proxy_set_header X-Forwarded-Proto $scheme;
             proxy_set_header X-Forwarded-Host $host;
             proxy_pass __OPENBLOCKS_SERVER_URL__;
diff --git a/deploy/helm/templates/backend/configMap.yaml b/deploy/helm/templates/backend/configMap.yaml
@@ -19,6 +19,5 @@ data:
   {{- end }}
   UID: {{ .Values.backend.config.userId | default "9001" | quote }}
   GID: {{ .Values.backend.config.groupId | default "9001" | quote }}
-  #CONTEXT_PATH: {{ .Values.ingress.contextPath | default "/" | quote }}
   CORS_ALLOWED_DOMAINS: {{ .Values.backend.config.corsAllowedDomains | default  "*" | quote }}
 
diff --git a/deploy/helm/templates/frontend/configMap.yaml b/deploy/helm/templates/frontend/configMap.yaml
@@ -14,7 +14,6 @@ metadata:
 data:
   UID: {{ .Values.frontend.config.userId | default "9001" | quote }}
   GID: {{ .Values.frontend.config.groupId | default "9001" | quote }}
-  #CONTEXT_PATH: {{ .Values.ingress.contextPath | default "/" | quote }}
   {{- if .Values.frontend.config.backendUrl }}
   OPENBLOCKS_SERVER_URL: {{ .Values.frontend.config.backendUrl | trimSuffix "/" | quote }}
   {{- else }}
