From 3245297037a824e563c2e59eefe45150e0161980 Mon Sep 17 00:00:00 2001 From: Vallari Agrawal Date: Wed, 12 Jun 2024 15:42:19 +0530 Subject: [PATCH 1/2] docker-compose: add teuthology-volume and t-api service And share pid namespaces btw teuthology and teuthology_api containers. Signed-off-by: Vallari Agrawal --- docs/docker-compose/docker-compose.yml | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/docs/docker-compose/docker-compose.yml b/docs/docker-compose/docker-compose.yml index f64d17a546..753f955774 100644 --- a/docs/docker-compose/docker-compose.yml +++ b/docs/docker-compose/docker-compose.yml @@ -67,6 +67,8 @@ services: links: - paddles - beanstalk + volumes: + - teuthology-volume:/teuthology/:rw environment: SSH_PRIVKEY: SSH_PRIVKEY_FILE: @@ -90,3 +92,32 @@ services: environment: SSH_PUBKEY: platform: linux/amd64 + teuthology_api: + # image: TODO: deploy tapi's image to quay and add here + # (by default use image instead of build context which is only for dev mode) + build: + context: ../../../teuthology-api + env_file: ../../../teuthology-api/.env + ports: + - 8082:8082 + environment: + TEUTHOLOGY_API_SERVER_HOST: 0.0.0.0 + TEUTHOLOGY_API_SERVER_PORT: 8082 + PADDLES_URL: http://paddles:8080 + DEPLOYMENT: development + volumes: + - teuthology-volume:/teuthology/:rw + - ../../../teuthology-api:/teuthology_api/:rw + depends_on: + - teuthology + - paddles + links: + - teuthology + - paddles + - beanstalk + healthcheck: + test: [ "CMD", "curl", "-f", "http://0.0.0.0:8082" ] + pid: service:teuthology + +volumes: + teuthology-volume: From a60603c2e1e5a6d472117a0090f620625dea12e4 Mon Sep 17 00:00:00 2001 From: Vallari Agrawal Date: Tue, 25 Jun 2024 13:15:12 +0530 Subject: [PATCH 2/2] docker-compose: only mount "teuthology_api/src" directory Reference: https://github.com/ceph/teuthology-api/pull/63/files Signed-off-by: Vallari Agrawal --- docs/docker-compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/docker-compose/docker-compose.yml b/docs/docker-compose/docker-compose.yml index 753f955774..9c9e2909d3 100644 --- a/docs/docker-compose/docker-compose.yml +++ b/docs/docker-compose/docker-compose.yml @@ -107,7 +107,7 @@ services: DEPLOYMENT: development volumes: - teuthology-volume:/teuthology/:rw - - ../../../teuthology-api:/teuthology_api/:rw + - ../../../teuthology-api/src:/teuthology_api/src:rw depends_on: - teuthology - paddles