diff --git a/modules/docker/codezero/.env b/modules/docker/codezero/.env index ff4bbbf..550cc2a 100644 --- a/modules/docker/codezero/.env +++ b/modules/docker/codezero/.env @@ -14,8 +14,15 @@ INITIAL_ROOT_MAIL=root@code0.tech INITIAL_RUNTIME_TOKEN=runtime # Runtime config -AQUILA_SAGITTARIUS_URL=http://nginx:80 -AQUILA_SAGITTARIUS_TOKEN=runtime +AQUILA_LOG_LEVEL=info +AQUILA_NATS_URL=nats://nats:4222 +AQUILA_NATS_BUCKET=flow_store +AQUILA_BACKEND_URL=http://nginx:80 +AQUILA_BACKEND_TOKEN=runtime +AQUILA_BACKEND_UNARY_TIMEOUT_SECS=10 +AQUILA_GRPC_HOST=0.0.0.0 +AQUILA_GRPC_PORT=8081 +AQUILA_GRPC_HEALTH_SERVICE=false DRACO_REST_PORT=8084 DRACO_REST_HOST=127.0.0.1 @@ -25,7 +32,6 @@ DRACO_CRON_AQUILA_TOKEN=draco-cron AQUILA_GRPC_CONNECT_TIMEOUT_SECS=2 AQUILA_GRPC_REQUEST_TIMEOUT_SECS=10 -SAGITTARIUS_UNARY_RPC_TIMEOUT_SECS=10 # Active services # Available services: ide, runtime, ide_velorum (AI orchestrator) diff --git a/modules/docker/codezero/compose.tf b/modules/docker/codezero/compose.tf index f4113b6..88dae30 100644 --- a/modules/docker/codezero/compose.tf +++ b/modules/docker/codezero/compose.tf @@ -19,7 +19,7 @@ DRACO_CRON_AQUILA_TOKEN=${random_password.draco_cron_aquila_token.result} COMPOSE_PROFILES=ide,runtime,ide_velorum IMAGE_REGISTRY=ghcr.io/code0-tech/reticulum/ci-builds -IMAGE_TAG=0.0.0-experimental-2659432195-272b82f76927a9a440762a6e07308904366644e6 +IMAGE_TAG=0.0.0-experimental-2670996161-2eb554dbab8c613033c3f8c87fed781f56889a5e IMAGE_EDITION=ce SAGITTARIUS_DB_ENCRYPTION_PRIMARY_KEY=${random_password.sagittarius_db_encryption_primary_key.result} @@ -39,13 +39,17 @@ POSTGRES_PASSWORD=${random_password.postgres_password.result} PROXY_NETWORK=${var.proxy_network} -AQUILA_ACTION_GLS_IDENTIFIER=gls-action +AQUILA_ACTION_GLS_IDENTIFIER=gls AQUILA_ACTION_GLS_TOKEN=${random_password.action_gls_token.result} AQUILA_ACTION_SHOPIFY_IDENTIFIER=shopify AQUILA_ACTION_SHOPIFY_TOKEN=${random_password.action_shopify_token.result} +AQUILA_ACTION_SHOPWARE_IDENTIFIER=shopware +AQUILA_ACTION_SHOPWARE_TOKEN=${random_password.action_shopware_token.result} +AQUILA_ACTION_WOOCOMMERCE_IDENTIFIER=woocommerce +AQUILA_ACTION_WOOCOMMERCE_TOKEN=${random_password.action_woocommerce_token.result} ACTION_IMAGE_REGISTRY=ghcr.io/code0-tech/centaurus/ci-builds -ACTION_IMAGE_TAG=0.0.0-experimental-2658871458-8568057de31b30d88afc20fc5aece7a9cef985fe +ACTION_IMAGE_TAG=0.0.0-experimental-2670874026-c3efa38d0214db2eca207cd218732be7c104c3e4 ENV } diff --git a/modules/docker/codezero/docker-compose.actions.yml b/modules/docker/codezero/docker-compose.actions.yml index 60926bf..e98ec7b 100644 --- a/modules/docker/codezero/docker-compose.actions.yml +++ b/modules/docker/codezero/docker-compose.actions.yml @@ -22,3 +22,27 @@ services: networks: - aquila restart: unless-stopped + + action-shopware: + image: ${ACTION_IMAGE_REGISTRY}/shopware-action:${ACTION_IMAGE_TAG} + environment: + ACTION_ID: ${AQUILA_ACTION_SHOPWARE_IDENTIFIER} + AUTH_TOKEN: ${AQUILA_ACTION_SHOPWARE_TOKEN} + AQUILA_URL: aquila:8081 + depends_on: + - aquila + networks: + - aquila + restart: unless-stopped + + action-woocommerce: + image: ${ACTION_IMAGE_REGISTRY}/woocommerce-action:${ACTION_IMAGE_TAG} + environment: + ACTION_ID: ${AQUILA_ACTION_WOOCOMMERCE_IDENTIFIER} + AUTH_TOKEN: ${AQUILA_ACTION_WOOCOMMERCE_TOKEN} + AQUILA_URL: aquila:8081 + depends_on: + - aquila + networks: + - aquila + restart: unless-stopped diff --git a/modules/docker/codezero/docker-compose.yml b/modules/docker/codezero/docker-compose.yml index 0648283..34f6349 100644 --- a/modules/docker/codezero/docker-compose.yml +++ b/modules/docker/codezero/docker-compose.yml @@ -174,20 +174,10 @@ services: condition: service_started image: ${IMAGE_REGISTRY}/aquila:${IMAGE_TAG} environment: - MODE: dynamic - NATS_URL: nats://nats:4222 - NATS_BUCKET: 'flow_store' - GRPC_HOST: 0.0.0.0 - SAGITTARIUS_URL: "${AQUILA_SAGITTARIUS_URL}" - RUNTIME_TOKEN: "${AQUILA_SAGITTARIUS_TOKEN}" - SAGITTARIUS_UNARY_RPC_TIMEOUT_SECS: "${SAGITTARIUS_UNARY_RPC_TIMEOUT_SECS}" + AQUILA_CONFIG_PATH: /tmp/generated-configs/aquila.aquila.yml + AQUILA_SERVICE_CONFIG_PATH: /tmp/generated-configs/aquila.service.configuration.json volumes: - generated-configs:/tmp/generated-configs:ro - entrypoint: | - sh -c " - cp /tmp/generated-configs/aquila.service.configuration.json /service.configuration.json - exec /aquila - " restart: unless-stopped profiles: - runtime @@ -258,4 +248,4 @@ volumes: networks: aquila: - name: codezero-aquila \ No newline at end of file + name: codezero-aquila diff --git a/modules/docker/codezero/secrets.tf b/modules/docker/codezero/secrets.tf index 6ea6764..14b280c 100644 --- a/modules/docker/codezero/secrets.tf +++ b/modules/docker/codezero/secrets.tf @@ -62,3 +62,13 @@ resource "random_password" "action_shopify_token" { length = 16 special = false } + +resource "random_password" "action_shopware_token" { + length = 16 + special = false +} + +resource "random_password" "action_woocommerce_token" { + length = 16 + special = false +}