X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker-compose.yml;h=02190b219c8d88186d7a4690cc8d2f6e1249ca2c;hb=refs%2Fchanges%2F70%2F7070%2F2;hp=91d3ec8002a71a8cc280c1e3f55cf39d21e3cae6;hpb=8339c9a882a586578b37f44a504e21c5208611c0;p=pti%2Fo2.git diff --git a/docker-compose.yml b/docker-compose.yml index 91d3ec8..02190b2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,7 +5,7 @@ services: redis_pubsub: build: context: . - dockerfile: Dockerfile + dockerfile: Dockerfile.localtest image: o2imsdms-image depends_on: - postgres @@ -15,12 +15,19 @@ services: - DB_PASSWORD=o2ims123 - REDIS_HOST=redis - PYTHONDONTWRITEBYTECODE=1 + - OS_AUTH_URL=${OS_AUTH_URL} + - OS_USERNAME=${OS_USERNAME} + - OS_PASSWORD=${OS_PASSWORD} + - LOGGING_CONFIG_LEVEL=DEBUG volumes: - - ./src:/src + - ./configs:/configs + - ./o2ims:/o2ims + - ./o2dms:/o2dms + - ./o2common:/o2common - ./tests:/tests entrypoint: - - python - - /src/o2ims/entrypoints/redis_eventconsumer.py + - /bin/sh + - /tests/o2ims-redis-entry.sh api: image: o2imsdms-image @@ -32,11 +39,18 @@ services: - API_HOST=api - REDIS_HOST=redis - PYTHONDONTWRITEBYTECODE=1 - - FLASK_APP=o2ims/entrypoints/flask_application.py + - FLASK_APP=/o2ims/entrypoints/flask_application.py - FLASK_DEBUG=1 - PYTHONUNBUFFERED=1 + - OS_AUTH_URL=${OS_AUTH_URL} + - OS_USERNAME=${OS_USERNAME} + - OS_PASSWORD=${OS_PASSWORD} + - LOGGING_CONFIG_LEVEL=DEBUG volumes: - - ./src:/src + - ./configs:/configs + - ./o2ims:/o2ims + - ./o2dms:/o2dms + - ./o2common:/o2common - ./tests:/tests entrypoint: - flask @@ -46,6 +60,33 @@ services: ports: - "5005:80" + watcher: + build: + context: . + dockerfile: Dockerfile.localtest + image: o2imsdms-image + depends_on: + - postgres + - redis + environment: + - DB_HOST=postgres + - DB_PASSWORD=o2ims123 + - REDIS_HOST=redis + - PYTHONDONTWRITEBYTECODE=1 + - OS_AUTH_URL=${OS_AUTH_URL} + - OS_USERNAME=${OS_USERNAME} + - OS_PASSWORD=${OS_PASSWORD} + - LOGGING_CONFIG_LEVEL=DEBUG + volumes: + - ./configs:/configs + - ./o2ims:/o2ims + - ./o2dms:/o2dms + - ./o2common:/o2common + - ./tests:/tests + entrypoint: + - /bin/sh + - /tests/o2ims-watcher-entry.sh + postgres: image: postgres:9.6 environment: