From 20af0dd38d2f3c5d19147e5825080ad2d24f5d32 Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Thu, 3 Jul 2025 07:11:29 +0300 Subject: [PATCH 1/7] Fix Docker --- frontend/Dockerfile | 2 +- frontend/nginx.conf | 11 +++++ frontend/public/env.js.template | 5 ++ navix-helm/templates/backend-ingress.yaml | 23 --------- navix-helm/templates/env-configmap.yaml | 11 +++++ .../templates/frontend-env-configmap.yaml | 9 ---- navix-helm/templates/frontend-ingress.yaml | 27 ---------- navix-helm/templates/ingress.yaml | 49 +++++++++++++++++++ navix-helm/values.yaml | 4 +- 9 files changed, 80 insertions(+), 61 deletions(-) create mode 100644 frontend/nginx.conf create mode 100644 frontend/public/env.js.template delete mode 100644 navix-helm/templates/backend-ingress.yaml create mode 100644 navix-helm/templates/env-configmap.yaml delete mode 100644 navix-helm/templates/frontend-env-configmap.yaml delete mode 100644 navix-helm/templates/frontend-ingress.yaml create mode 100644 navix-helm/templates/ingress.yaml diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 9f5a53f..05b544b 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -3,7 +3,7 @@ FROM node:20 AS builder WORKDIR /app COPY . . -RUN npm install +RUN npm install --legacy-peer-deps RUN npm run build # Stage 2: Serve with nginx diff --git a/frontend/nginx.conf b/frontend/nginx.conf new file mode 100644 index 0000000..79fd959 --- /dev/null +++ b/frontend/nginx.conf @@ -0,0 +1,11 @@ +server { + listen 80; + server_name _; + + root /usr/share/nginx/html; + index index.html; + + location / { + try_files $uri $uri/ /index.html; + } +} diff --git a/frontend/public/env.js.template b/frontend/public/env.js.template new file mode 100644 index 0000000..299dcc9 --- /dev/null +++ b/frontend/public/env.js.template @@ -0,0 +1,5 @@ +window.ENV = { + API_BASE: "${API_BASE}", + MINIO_ENDPOINT: "${MINIO_ENDPOINT}", + MINIO_BUCKET: "${MINIO_BUCKET}" +}; diff --git a/navix-helm/templates/backend-ingress.yaml b/navix-helm/templates/backend-ingress.yaml deleted file mode 100644 index 02fa268..0000000 --- a/navix-helm/templates/backend-ingress.yaml +++ /dev/null @@ -1,23 +0,0 @@ -{{- if .Values.backend.ingress.enabled }} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: navix-backend - annotations: - {{- range $key, $value := .Values.backend.ingress.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} -spec: - ingressClassName: {{ .Values.backend.ingress.className }} - rules: - - host: {{ .Values.backend.ingress.hosts[0].host }} - http: - paths: - - path: /api - pathType: Prefix - backend: - service: - name: navix-backend - port: - number: {{ .Values.backend.service.port }} -{{- end }} diff --git a/navix-helm/templates/env-configmap.yaml b/navix-helm/templates/env-configmap.yaml new file mode 100644 index 0000000..afc939e --- /dev/null +++ b/navix-helm/templates/env-configmap.yaml @@ -0,0 +1,11 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: navix-frontend-env +data: + env.js: | + window.ENV = { + API_BASE: "{{ .Values.frontend.env.API_BASE }}", + MINIO_ENDPOINT: "{{ .Values.frontend.env.MINIO_ENDPOINT }}", + MINIO_BUCKET: "{{ .Values.frontend.env.MINIO_BUCKET }}" + }; diff --git a/navix-helm/templates/frontend-env-configmap.yaml b/navix-helm/templates/frontend-env-configmap.yaml deleted file mode 100644 index a4faaf6..0000000 --- a/navix-helm/templates/frontend-env-configmap.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: navix-frontend-env -data: - env.js: | - window.env = { - VITE_API_URL: "{{ .Values.frontend.env.VITE_API_URL }}" - }; diff --git a/navix-helm/templates/frontend-ingress.yaml b/navix-helm/templates/frontend-ingress.yaml deleted file mode 100644 index b1d61d4..0000000 --- a/navix-helm/templates/frontend-ingress.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{- if .Values.frontend.ingress.enabled }} -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: navix-frontend - annotations: - {{- range $key, $value := .Values.frontend.ingress.annotations }} - {{ $key }}: {{ $value | quote }} - {{- end }} -spec: - ingressClassName: {{ .Values.frontend.ingress.className }} - rules: - {{- range .Values.frontend.ingress.hosts }} - - host: {{ .host }} - http: - paths: - {{- range .paths }} - - path: {{ .path }} - pathType: {{ .pathType }} - backend: - service: - name: navix-frontend - port: - number: {{ $.Values.frontend.service.port }} - {{- end }} - {{- end }} -{{- end }} diff --git a/navix-helm/templates/ingress.yaml b/navix-helm/templates/ingress.yaml new file mode 100644 index 0000000..6f721aa --- /dev/null +++ b/navix-helm/templates/ingress.yaml @@ -0,0 +1,49 @@ +{{- if .Values.frontend.ingress.enabled }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: navix-frontend + annotations: + {{- range $key, $value := .Values.frontend.ingress.annotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} +spec: + ingressClassName: {{ .Values.frontend.ingress.className }} + rules: + - host: {{ .Values.frontend.ingress.hosts[0].host }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: navix-frontend + port: + number: {{ .Values.frontend.service.port }} +{{- end }} + +--- + +{{- if .Values.backend.ingress.enabled }} +apiVersion: networking.k8s.io/v1 +kind: Ingress +metadata: + name: navix-backend + annotations: + {{- range $key, $value := .Values.backend.ingress.annotations }} + {{ $key }}: {{ $value | quote }} + {{- end }} +spec: + ingressClassName: {{ .Values.backend.ingress.className }} + rules: + - host: {{ .Values.backend.ingress.hosts[0].host }} + http: + paths: + - path: /api + pathType: Prefix + backend: + service: + name: navix-backend + port: + number: {{ .Values.backend.service.port }} +{{- end }} \ No newline at end of file diff --git a/navix-helm/values.yaml b/navix-helm/values.yaml index f97bd25..0e67780 100644 --- a/navix-helm/values.yaml +++ b/navix-helm/values.yaml @@ -18,7 +18,9 @@ frontend: - path: / pathType: Prefix env: - VITE_API_URL: "/api" + API_BASE: "https://navix.dvirlabs.com/api" + MINIO_ENDPOINT: "s3.dvirlabs.com" + MINIO_BUCKET: "navix-icons" backend: image: From 9dfb32b6125cf4f501ff6d4b121b539cbe962fc0 Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Thu, 3 Jul 2025 07:13:48 +0300 Subject: [PATCH 2/7] Debug --- backend/main.py | 1 - frontend/public/env.js.template | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/main.py b/backend/main.py index a4add29..773cccc 100644 --- a/backend/main.py +++ b/backend/main.py @@ -92,4 +92,3 @@ app.include_router(router, prefix="/api") if __name__ == "__main__": import uvicorn uvicorn.run("main:app", host="0.0.0.0", port=8000, reload=True) - diff --git a/frontend/public/env.js.template b/frontend/public/env.js.template index 299dcc9..77ab514 100644 --- a/frontend/public/env.js.template +++ b/frontend/public/env.js.template @@ -3,3 +3,4 @@ window.ENV = { MINIO_ENDPOINT: "${MINIO_ENDPOINT}", MINIO_BUCKET: "${MINIO_BUCKET}" }; + From b5122bc289f5daacce86aa315f37ed91885719b2 Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Thu, 3 Jul 2025 07:15:40 +0300 Subject: [PATCH 3/7] Debug --- backend/main.py | 1 + frontend/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/backend/main.py b/backend/main.py index 773cccc..a4add29 100644 --- a/backend/main.py +++ b/backend/main.py @@ -92,3 +92,4 @@ app.include_router(router, prefix="/api") if __name__ == "__main__": import uvicorn uvicorn.run("main:app", host="0.0.0.0", port=8000, reload=True) + diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 05b544b..e7467e7 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -27,3 +27,4 @@ RUN dos2unix /docker-entrypoint.d/10-generate-env.sh && chmod +x /docker-entrypo EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] + From b8b0ab3dc42c23397464a0d820dfe5b862ea8e7b Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Thu, 3 Jul 2025 07:35:29 +0300 Subject: [PATCH 4/7] Debug --- backend/Dockerfile | 1 - frontend/Dockerfile | 1 - 2 files changed, 2 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 5930ae8..273c640 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -7,4 +7,3 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] EXPOSE 8000 - diff --git a/frontend/Dockerfile b/frontend/Dockerfile index e7467e7..05b544b 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -27,4 +27,3 @@ RUN dos2unix /docker-entrypoint.d/10-generate-env.sh && chmod +x /docker-entrypo EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] - From 8c1d55b008cfe9a195f99d73473b4a6e12109fbb Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Thu, 3 Jul 2025 07:44:34 +0300 Subject: [PATCH 5/7] Debug --- backend/Dockerfile | 1 + frontend/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/backend/Dockerfile b/backend/Dockerfile index 273c640..5930ae8 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -7,3 +7,4 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] EXPOSE 8000 + diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 05b544b..e7467e7 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -27,3 +27,4 @@ RUN dos2unix /docker-entrypoint.d/10-generate-env.sh && chmod +x /docker-entrypo EXPOSE 80 CMD ["nginx", "-g", "daemon off;"] + From cb990e8af235ccf972c0ea5fcf19211c7149a1b5 Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Thu, 3 Jul 2025 07:46:24 +0300 Subject: [PATCH 6/7] Debug --- backend/Dockerfile | 3 +-- frontend/Dockerfile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 5930ae8..3301c08 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -6,5 +6,4 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] -EXPOSE 8000 - +EXPOSE 8000 \ No newline at end of file diff --git a/frontend/Dockerfile b/frontend/Dockerfile index e7467e7..24eaf73 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -26,5 +26,4 @@ COPY 10-generate-env.sh /docker-entrypoint.d/10-generate-env.sh RUN dos2unix /docker-entrypoint.d/10-generate-env.sh && chmod +x /docker-entrypoint.d/10-generate-env.sh EXPOSE 80 -CMD ["nginx", "-g", "daemon off;"] - +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file From 6e294363ffaf30b4a3c7edc51831385d4be8e15b Mon Sep 17 00:00:00 2001 From: dvirlabs Date: Thu, 3 Jul 2025 07:59:59 +0300 Subject: [PATCH 7/7] Debug --- backend/Dockerfile | 2 +- frontend/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/Dockerfile b/backend/Dockerfile index 3301c08..273c640 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -6,4 +6,4 @@ RUN pip install --no-cache-dir -r requirements.txt COPY . . CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"] -EXPOSE 8000 \ No newline at end of file +EXPOSE 8000 diff --git a/frontend/Dockerfile b/frontend/Dockerfile index 24eaf73..05b544b 100644 --- a/frontend/Dockerfile +++ b/frontend/Dockerfile @@ -26,4 +26,4 @@ COPY 10-generate-env.sh /docker-entrypoint.d/10-generate-env.sh RUN dos2unix /docker-entrypoint.d/10-generate-env.sh && chmod +x /docker-entrypoint.d/10-generate-env.sh EXPOSE 80 -CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +CMD ["nginx", "-g", "daemon off;"]