From afbdec26d1d2962165fe3c4f232e3cda093f1d8a Mon Sep 17 00:00:00 2001 From: Hien To <> Date: Fri, 25 Aug 2023 10:38:38 +0700 Subject: [PATCH] Chore: Update new env and commit for app-backend --- app-backend | 2 +- conf/sample.env_app-backend | 4 +++- conf/sample.env_web-client | 3 ++- docker-compose.yml | 14 ++++++++++++++ web-client | 2 +- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app-backend b/app-backend index 74273d1e0..4a58195b2 160000 --- a/app-backend +++ b/app-backend @@ -1 +1 @@ -Subproject commit 74273d1e0c50b8851faa96358369e1a0070c705e +Subproject commit 4a58195b2e3ff1cb6b465764c6ff5ba98ea42ab1 diff --git a/conf/sample.env_app-backend b/conf/sample.env_app-backend index 1de335a67..605f65b09 100644 --- a/conf/sample.env_app-backend +++ b/conf/sample.env_app-backend @@ -13,9 +13,11 @@ HASURA_GRAPHQL_ENABLED_LOG_TYPES=startup, http-log, webhook-log, websocket-log, HASURA_GRAPHQL_ADMIN_SECRET=myadminsecretkey HASURA_GRAPHQL_UNAUTHORIZED_ROLE="public" HASURA_GRAPHQL_METADATA_DEFAULTS='{"backend_configs":{"dataconnector":{"athena":{"uri":"http://data-connector-agent:8081/api/v1/athena"},"mariadb":{"uri":"http://data-connector-agent:8081/api/v1/mariadb"},"mysql8":{"uri":"http://data-connector-agent:8081/api/v1/mysql"},"oracle":{"uri":"http://data-connector-agent:8081/api/v1/oracle"},"snowflake":{"uri":"http://data-connector-agent:8081/api/v1/snowflake"}}}}' -HASURA_GRAPHQL_JWT_SECRET={"type": "RS256", "key": "-----BEGIN CERTIFICATE-----\n...\n-----END CERTIFICATE-----"} +HASURA_GRAPHQL_JWT_SECRET={"jwk_url": "http://keycloak:8088/realms/hasura/protocol/openid-connect/certs"} # Environment variable for auto migrate HASURA_GRAPHQL_MIGRATIONS_DIR=/migrations HASURA_GRAPHQL_METADATA_DIR=/metadata HASURA_GRAPHQL_ENABLE_CONSOLE='true' +HASURA_ACTION_STABLE_DIFFUSION_URL=http://stablediffusion:8087 +HASURA_EVENTS_HOOK_URL="http://worker:8787" \ No newline at end of file diff --git a/conf/sample.env_web-client b/conf/sample.env_web-client index 591a2dcd6..43b01085f 100644 --- a/conf/sample.env_web-client +++ b/conf/sample.env_web-client @@ -16,4 +16,5 @@ NEXTAUTH_URL=http://localhost:3000 NEXTAUTH_SECRET=my-secret END_SESSION_URL=http://keycloak:8088/realms/new-realm/protocol/openid-connect/logout REFRESH_TOKEN_URL=http://keycloak:8088/realms/new-realm/protocol/openid-connect/token -HASURA_ADMIN_TOKEN=myadminsecretkey \ No newline at end of file +HASURA_ADMIN_TOKEN=myadminsecretkey +NEXT_PUBLIC_GRAPHQL_ENGINE_URL=hasura:8080 diff --git a/docker-compose.yml b/docker-compose.yml index 844f547ba..1c93252d0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -70,6 +70,20 @@ services: networks: jan_community: + worker: + build: + context: ./app-backend + dockerfile: ./worker/Dockerfile + restart: always + environment: + - "NODE_ENV=development" + volumes: + - .:/worker + ports: + - "8787:8787" + networks: + jan_community: + data-connector-agent: image: hasura/graphql-data-connector:v2.31.0 restart: always diff --git a/web-client b/web-client index e105df566..eb00c6650 160000 --- a/web-client +++ b/web-client @@ -1 +1 @@ -Subproject commit e105df5665055b1132ed485b6889e5b7382a599d +Subproject commit eb00c6650dc62aa1515b8ff5ef47e8395e1baba5