fix: fix wrong env name (#350)

Because

- API_GATEWAY_BASE_URL_FOR_SERVER should be API_GATEWAY_BASE_URL_FOR_SSR

This commit

- fix wrong env name

entrypoint.sh

@@ -17,7 +17,9 @@ echo "NEXT_PUBLIC_API_VERSION=$NEXT_PUBLIC_API_VERSION"
 test -n "$NEXT_PUBLIC_API_VERSION"
 echo "NEXT_PUBLIC_CONSOLE_EDITION=$NEXT_PUBLIC_CONSOLE_EDITION"
 test -n "$NEXT_PUBLIC_CONSOLE_EDITION"
+echo "API_GATEWAY_BASE_URL_FOR_SSR=$API_GATEWAY_BASE_URL_FOR_SSR"
+test -n "$API_GATEWAY_BASE_URL_FOR_SSR"
 
-NEXT_PUBLIC_DISABLE_USAGE_COLLECTION=$NEXT_PUBLIC_DISABLE_USAGE_COLLECTION NEXT_PUBLIC_MGMT_BACKEND_BASE_URL=$NEXT_PUBLIC_MGMT_BACKEND_BASE_URL NEXT_PUBLIC_PIPELINE_BACKEND_BASE_URL=$NEXT_PUBLIC_PIPELINE_BACKEND_BASE_URL NEXT_PUBLIC_CONNECTOR_BACKEND_BASE_URL=$NEXT_PUBLIC_CONNECTOR_BACKEND_BASE_URL NEXT_PUBLIC_MODEL_BACKEND_BASE_URL=$NEXT_PUBLIC_MODEL_BACKEND_BASE_URL NEXT_PUBLIC_API_VERSION=$NEXT_PUBLIC_API_VERSION NEXT_PUBLIC_CONSOLE_BASE_URL=$NEXT_PUBLIC_CONSOLE_BASE_URL NEXT_PUBLIC_CONSOLE_EDITION=$NEXT_PUBLIC_CONSOLE_EDITION NEXT_PUBLIC_API_GATEWAY_BASE_URL_FOR_CLIENT=$NEXT_PUBLIC_API_GATEWAY_BASE_URL_FOR_CLIENT ./env.sh
+NEXT_PUBLIC_DISABLE_USAGE_COLLECTION=$NEXT_PUBLIC_DISABLE_USAGE_COLLECTION NEXT_PUBLIC_MGMT_BACKEND_BASE_URL=$NEXT_PUBLIC_MGMT_BACKEND_BASE_URL NEXT_PUBLIC_PIPELINE_BACKEND_BASE_URL=$NEXT_PUBLIC_PIPELINE_BACKEND_BASE_URL NEXT_PUBLIC_CONNECTOR_BACKEND_BASE_URL=$NEXT_PUBLIC_CONNECTOR_BACKEND_BASE_URL NEXT_PUBLIC_MODEL_BACKEND_BASE_URL=$NEXT_PUBLIC_MODEL_BACKEND_BASE_URL NEXT_PUBLIC_API_VERSION=$NEXT_PUBLIC_API_VERSION NEXT_PUBLIC_CONSOLE_BASE_URL=$NEXT_PUBLIC_CONSOLE_BASE_URL NEXT_PUBLIC_CONSOLE_EDITION=$NEXT_PUBLIC_CONSOLE_EDITION NEXT_PUBLIC_API_GATEWAY_BASE_URL_FOR_CLIENT=$NEXT_PUBLIC_API_GATEWAY_BASE_URL_FOR_CLIENT API_GATEWAY_BASE_URL_FOR_SSR=$API_GATEWAY_BASE_URL_FOR_SSR ./env.sh
 
 node server.js

package.json

@@ -8,7 +8,7 @@
   "private": false,
   "scripts": {
     "docker-build": "docker build -f Dockerfile -t instill-console .",
-    "docker-run": "docker run --rm -t --network instill-network --entrypoint ./entrypoint.sh -p 3000:3000 -e NEXT_PUBLIC_CONSOLE_BASE_URL='http://localhost:3000' -e NEXT_PUBLIC_API_GATEWAY_BASE_URL_FOR_CLIENT='http://localhost:8080' -e NEXT_PUBLIC_API_VERSION='v1alpha' -e NEXT_PUBLIC_INSTILL_AI_USER_COOKIE_NAME='instill-ai-user' -e API_GATEWAY_BASE_URL=http://api-gateway:8080 instill-console",
+    "docker-run": "docker run --rm -t --network instill-network --entrypoint ./entrypoint.sh -p 3000:3000 -e NEXT_PUBLIC_CONSOLE_BASE_URL='http://localhost:3000' -e NEXT_PUBLIC_API_GATEWAY_BASE_URL_FOR_CLIENT='http://localhost:8080' -e NEXT_PUBLIC_API_VERSION='v1alpha' -e NEXT_PUBLIC_INSTILL_AI_USER_COOKIE_NAME='instill-ai-user' -e API_GATEWAY_BASE_URL_FOR_SSR=http://api-gateway:8080 instill-console",
     "docker-build-test": "docker build -f Dockerfile.playwright --build-arg TEST_USER='root' -t instill-console-integration .",
     "docker-run-test": "docker run --rm -t --network instill-network --entrypoint ./entrypoint-playwright.sh -e NEXT_PUBLIC_CONSOLE_BASE_URL='http://localhost:3000' -e NEXT_PUBLIC_API_GATEWAY_BASE_URL_FOR_CLIENT='https://localhost:8080' -e NEXT_PUBLIC_API_VERSION='v1alpha' -e NEXT_PUBLIC_INSTILL_AI_USER_COOKIE_NAME='instill-ai-user' -e NEXT_PUBLIC_SELF_SIGNED_CERTIFICATION=true instill-console-integration",
     "docker:prune-cache": "docker buildx prune",

src/lib/instill/helper/index.ts

@@ -56,7 +56,7 @@ export const createInstillAxiosClient = () => {
 
   return axios.create({
     baseURL:
-      process.env.API_GATEWAY_BASE_URL_FOR_SERVER ||
+      process.env.API_GATEWAY_BASE_URL_FOR_SSR ||
       env("NEXT_PUBLIC_API_GATEWAY_BASE_URL_FOR_CLIENT"),
     httpsAgent:
       env("NEXT_PUBLIC_SELF_SIGNED_CERTIFICATION") === "true"