[Upd #151] Revert to 86002d3 to have runtime environment variables

kbss-cvut · Jan 25, 2024 · 097306b · 097306b
1 parent f05533d
commit 097306b
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -13,5 +13,13 @@ RUN npm run build
 FROM nginx
 COPY --from=build /usr/src/app/dist /usr/share/nginx/html/
 RUN chmod a+r -R /usr/share/nginx/html
+
+COPY deploy/.docker/config.js.template /etc/nginx/config.js.template
+COPY deploy/.docker/error.html /usr/share/nginx/html/error.html
+COPY deploy/.docker/nginx.conf /etc/nginx/nginx.conf
+
 EXPOSE 80
+COPY deploy/.docker/docker-entrypoint.sh /
+RUN chmod a+x /docker-entrypoint.sh
+ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD ["nginx", "-g", "daemon off;"]
diff --git a/deploy/.docker/config.js.template b/deploy/.docker/config.js.template
@@ -0,0 +1,5 @@
+// Dynamic configuration
+window.__config__ = {
+  API_URL:'${API_URL}',
+  ADMIN_REGISTRATION_ONLY:'${ADMIN_REGISTRATION_ONLY}'
+}
diff --git a/deploy/.docker/docker-entrypoint.sh b/deploy/.docker/docker-entrypoint.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+set -eu
+
+envsubst '${API_URL} ${ADMIN_REGISTRATION_ONLY}' < /etc/nginx/config.js.template > /usr/share/nginx/html/config.js
+
+exec "$@"
diff --git a/deploy/no-proxy/docker-compose.yml b/deploy/no-proxy/docker-compose.yml
@@ -4,8 +4,8 @@ services:
   fta-fmea:
     image: ghcr.io/kbss-cvut/fta-fmea-ui:latest
     environment:
-      VITE_API_URL: ${VITE_API_URL:-http://localhost:9999/}
-      VITE_ADMIN_REGISTRATION_ONLY: ${VITE_ADMIN_REGISTRATION_ONLY:-false}
+      API_URL: ${VITE_API_URL:-http://localhost:9999/}
+      ADMIN_REGISTRATION_ONLY: ${VITE_ADMIN_REGISTRATION_ONLY:-false}
     ports:
       - "8080:80"
     depends_on:

diff --git a/global.d.ts b/global.d.ts
@@ -0,0 +1,6 @@
+interface Window {
+    __config__: {
+        API_URL: string;
+        ADMIN_REGISTRATION_ONLY: string;
+    }
+}
diff --git a/index.html b/index.html
@@ -4,6 +4,8 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <!-- Runtime environment variables -->
+    <script src="/config.js"></script>
     <title>FTA/FMEA Analysis</title>
 </head>
 <body>

diff --git a/src/services/utils/axiosUtils.tsx b/src/services/utils/axiosUtils.tsx
@@ -3,7 +3,7 @@ import {appHistory} from "@components/routes/AppRoutes";
 import {ROUTES} from "@utils/constants";
 
 const axiosClient = axios.create({
-    baseURL: import.meta.env.VITE_API_URL
+    baseURL: (window as any).__config__.API_URL
 });
 
 axiosClient.interceptors.response.use(