Add config

sjultra · Nov 6, 2023 · aabfe1c · aabfe1c
1 parent b598f64
commit aabfe1c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/helm/service/templates/sammwise.yaml b/helm/service/templates/sammwise.yaml
@@ -19,6 +19,9 @@ spec:
           env:
             - name: NEXT_PUBLIC_BASE_PATH
               value: {{ .Values.sammwise.NEXT_PUBLIC_BASE_PATH | quote }}
+            - name: RANCHER_SERVER
+              value: {{ .Values.sammwise.RANCHER_SERVER | quote }}
+
           # {{- end }}
 ---
 apiVersion: v1

diff --git a/helm/service/values.yaml b/helm/service/values.yaml
@@ -6,6 +6,7 @@ sammwise:
   image: sjultra/sammwise:latest
   # port: 80
   NEXT_PUBLIC_BASE_PATH: "/k8s/clusters/c-m-26nk9h9f/api/v1/namespaces/sammwise/services/http:sammwise:80/proxy"
+  RANCHER_SERVER: "rancher.vzxy.net"
 
 # issuer:
 #   issuerEmail: [email protected]

diff --git a/next.config.js b/next.config.js
@@ -1,12 +1,13 @@
 module.exports = {
-  basePath: process.env.NEXT_PUBLIC_BASE_PATH || '',
-  assetPrefix: process.env.NEXT_PUBLIC_BASE_PATH || '',
-  hostname: 'rancher.vzxy.net',
+  basePath: process.env.NEXT_BASE_PATH || '',
+  assetPrefix: process.env.RANCHER_SERVER + process.env.NEXT_PUBLIC_BASE_PATH || '',
+  hostname: process.env.RANCHER_SERVER,
   // images: {
   //   path: process.env.NEXT_PUBLIC_BASE_PATH || '',
   // },
 
   publicRuntimeConfig: {
-    webSocketBasePath: process.env.NEXT_PUBLIC_BASE_PATH || '',
+    hmrEndpoint: 'wss://'+process.env.RANCHER_SERVER+process.env.NEXT_PUBLIC_BASE_PATH,
+    webSocketBasePath: 'wss://'+process.env.RANCHER_SERVER+process.env.NEXT_PUBLIC_BASE_PATH,
   }
 };