From 42ceecde9f677f9a6b1bfe0de8ecd6b6c177fde4 Mon Sep 17 00:00:00 2001 From: John Smith Date: Sat, 30 Nov 2024 18:16:35 +1030 Subject: [PATCH] Rename docker compose files (#170) --- control-plane/README.md | 2 +- control-plane/docker-compose.dev.yml | 38 +++++++++++++++++ control-plane/docker-compose.hobby.yml | 58 -------------------------- control-plane/docker-compose.yml | 34 +++++++++++---- 4 files changed, 66 insertions(+), 66 deletions(-) create mode 100644 control-plane/docker-compose.dev.yml delete mode 100644 control-plane/docker-compose.hobby.yml diff --git a/control-plane/README.md b/control-plane/README.md index 78e581b3..800fe8b2 100644 --- a/control-plane/README.md +++ b/control-plane/README.md @@ -27,7 +27,7 @@ To run the control plane locally for development: 1. Start the local resources required for development: ```bash -docker compose up +docker compose -f docker-compose.dev.yml up ``` This will start: diff --git a/control-plane/docker-compose.dev.yml b/control-plane/docker-compose.dev.yml new file mode 100644 index 00000000..0bb757da --- /dev/null +++ b/control-plane/docker-compose.dev.yml @@ -0,0 +1,38 @@ +services: + postgres: + extends: + file: docker-compose.base.yml + service: postgres + ports: + - "5432:5432" + + redis: + extends: + file: docker-compose.base.yml + service: redis + ports: + - "6379:6379" + + elasticmq: + extends: + file: docker-compose.base.yml + service: elasticmq + ports: + - "9324:9324" + - "9325:9325" + +volumes: + pgdata: + elasticmqdata: + +configs: + elasticmq_conf: + content: | + include classpath("application.conf") + + queues { + run-process {} + run-generate-name {} + customer-telemetry {} + external-tool-call {} + } diff --git a/control-plane/docker-compose.hobby.yml b/control-plane/docker-compose.hobby.yml deleted file mode 100644 index 80d26e80..00000000 --- a/control-plane/docker-compose.hobby.yml +++ /dev/null @@ -1,58 +0,0 @@ -services: - control-plane: - image: inferable/control-plane:latest - container_name: control-plane - depends_on: - - postgres - - redis - - elasticmq - ports: - - "4000:4000" - environment: - DATABASE_URL: "postgresql://inferable:inferable@postgres:5432/inferable" - DATABASE_SSL_DISABLED: "true" - REDIS_URL: "redis://redis:6379" - # Required for elasticmq - AWS_REGION: "us-east-1" - AWS_ACCESS_KEY_ID: "PLACEHOLDER" - AWS_SECRET_ACCESS_KEY: "PLACEHOLDER" - SQS_BASE_QUEUE_URL: 'http://elasticmq:9324/000000000000' - SQS_RUN_PROCESS_QUEUE_URL: 'http://elasticmq:9324/000000000000/run-process' - SQS_RUN_GENERATE_NAME_QUEUE_URL: 'http://elasticmq:9324/000000000000/run-generate-name' - SQS_CUSTOMER_TELEMETRY_QUEUE_URL: 'http://elasticmq:9324/000000000000/customer-telemetry' - SQS_EXTERNAL_TOOL_CALL_QUEUE_URL: 'http://elasticmq:9324/000000000000/external-tool-call' - MANAGEMENT_API_SECRET: ${MANAGEMENT_API_SECRET} - ANTHROPIC_API_KEY: ${ANTHROPIC_API_KEY} - COHERE_API_KEY: ${COHERE_API_KEY} - - - postgres: - extends: - file: docker-compose.base.yml - service: postgres - - redis: - extends: - file: docker-compose.base.yml - service: redis - - elasticmq: - extends: - file: docker-compose.base.yml - service: elasticmq - -volumes: - pgdata: - elasticmqdata: - -configs: - elasticmq_conf: - content: | - include classpath("application.conf") - - queues { - run-process {} - run-generate-name {} - customer-telemetry {} - external-tool-call {} - } diff --git a/control-plane/docker-compose.yml b/control-plane/docker-compose.yml index 0bb757da..80d26e80 100644 --- a/control-plane/docker-compose.yml +++ b/control-plane/docker-compose.yml @@ -1,25 +1,45 @@ services: + control-plane: + image: inferable/control-plane:latest + container_name: control-plane + depends_on: + - postgres + - redis + - elasticmq + ports: + - "4000:4000" + environment: + DATABASE_URL: "postgresql://inferable:inferable@postgres:5432/inferable" + DATABASE_SSL_DISABLED: "true" + REDIS_URL: "redis://redis:6379" + # Required for elasticmq + AWS_REGION: "us-east-1" + AWS_ACCESS_KEY_ID: "PLACEHOLDER" + AWS_SECRET_ACCESS_KEY: "PLACEHOLDER" + SQS_BASE_QUEUE_URL: 'http://elasticmq:9324/000000000000' + SQS_RUN_PROCESS_QUEUE_URL: 'http://elasticmq:9324/000000000000/run-process' + SQS_RUN_GENERATE_NAME_QUEUE_URL: 'http://elasticmq:9324/000000000000/run-generate-name' + SQS_CUSTOMER_TELEMETRY_QUEUE_URL: 'http://elasticmq:9324/000000000000/customer-telemetry' + SQS_EXTERNAL_TOOL_CALL_QUEUE_URL: 'http://elasticmq:9324/000000000000/external-tool-call' + MANAGEMENT_API_SECRET: ${MANAGEMENT_API_SECRET} + ANTHROPIC_API_KEY: ${ANTHROPIC_API_KEY} + COHERE_API_KEY: ${COHERE_API_KEY} + + postgres: extends: file: docker-compose.base.yml service: postgres - ports: - - "5432:5432" redis: extends: file: docker-compose.base.yml service: redis - ports: - - "6379:6379" elasticmq: extends: file: docker-compose.base.yml service: elasticmq - ports: - - "9324:9324" - - "9325:9325" volumes: pgdata: