From 6887fcb04ffa569f4ecfa375183a862eb6ac742d Mon Sep 17 00:00:00 2001 From: EiffelFly <57251712+EiffelFly@users.noreply.github.com> Date: Tue, 5 Mar 2024 20:51:16 +0800 Subject: [PATCH] feat: add back INSTILL_CORE_HOST --- .env | 3 +++ .github/workflows/integration-test-console.yml | 4 ++++ docker-compose.yml | 4 ++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.env b/.env index 23e9b563..f9b804b8 100644 --- a/.env +++ b/.env @@ -46,6 +46,9 @@ KRAKEND_CE_VERSION=2.5.0 ARTIVC_VERSION=0.10.0 K6_VERSION=0.44.0 +# Instill Core isntance host +INSTILL_CORE_HOST=localhost + # api-gateway API_GATEWAY_IMAGE=instill/api-gateway API_GATEWAY_VERSION=0.11.0-beta diff --git a/.github/workflows/integration-test-console.yml b/.github/workflows/integration-test-console.yml index d10a38db..2711a50a 100644 --- a/.github/workflows/integration-test-console.yml +++ b/.github/workflows/integration-test-console.yml @@ -49,6 +49,7 @@ jobs: - name: Launch Instill Core (latest) run: | + INSTILL_CORE_HOST=api-gateway \ COMPOSE_PROFILES=all \ EDITION=local-ce:test \ RAY_LATEST_TAG=latest \ @@ -114,6 +115,7 @@ jobs: - name: Launch Instill Core (latest) run: | + INSTILL_CORE_HOST=api-gateway \ COMPOSE_PROFILES=all \ EDITION=local-ce:test \ RAY_LATEST_TAG=latest \ @@ -195,6 +197,7 @@ jobs: - name: Launch Instill Core (release) run: | + INSTILL_CORE_HOST=api-gateway \ EDITION=local-ce:test \ RAY_LATEST_TAG=latest \ docker compose up -d --quiet-pull @@ -258,6 +261,7 @@ jobs: - name: Launch Instill Core (release) run: | + INSTILL_CORE_HOST=api-gateway \ EDITION=local-ce:test \ RAY_LATEST_TAG=latest \ docker compose up -d --quiet-pull diff --git a/docker-compose.yml b/docker-compose.yml index e728a18f..f09693a6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -357,8 +357,8 @@ services: NEXT_PUBLIC_MODEL_API_VERSION: v1alpha NEXT_PUBLIC_USAGE_COLLECTION_ENABLED: ${USAGE_ENABLED} NEXT_PUBLIC_CONSOLE_EDITION: ${EDITION} - NEXT_PUBLIC_CONSOLE_BASE_URL: http://${INSTILL_CORE_HOST}:${CONSOLE_PORT} - NEXT_PUBLIC_API_GATEWAY_URL: http://${API_GATEWAY_HOST}:${API_GATEWAY_PORT} + NEXT_PUBLIC_CONSOLE_BASE_URL: http://${CONSOLE_HOST}:${CONSOLE_PORT} + NEXT_PUBLIC_API_GATEWAY_URL: http://${INSTILL_CORE_HOST}:${API_GATEWAY_PORT} NEXT_SERVER_API_GATEWAY_URL: http://${API_GATEWAY_HOST}:${API_GATEWAY_PORT} NEXT_PUBLIC_INSTILL_AI_USER_COOKIE_NAME: instill-ai-user NEXT_PUBLIC_SELF_SIGNED_CERTIFICATION: "false"