X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker-compose.yml;h=c7ca8b70d13791ab0b9deda4688c932cd1bd4564;hb=refs%2Fchanges%2F05%2F7005%2F7;hp=255fbd9aa511890fc2e38ad8259d3847868f9a89;hpb=81e3575a77366f30c2049f98c48a3087db0ea992;p=pti%2Fo2.git diff --git a/docker-compose.yml b/docker-compose.yml index 255fbd9..c7ca8b7 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,6 +15,9 @@ services: - DB_PASSWORD=o2ims123 - REDIS_HOST=redis - PYTHONDONTWRITEBYTECODE=1 + - OS_AUTH_URL=${OS_AUTH_URL} + - OS_USERNAME=${OS_USERNAME} + - OS_PASSWORD=${OS_PASSWORD} volumes: - ./o2ims:/o2ims - ./o2dms:/o2dms @@ -37,9 +40,9 @@ services: - FLASK_APP=/o2ims/entrypoints/flask_application.py - FLASK_DEBUG=1 - PYTHONUNBUFFERED=1 - - STX_AUTH_URL=http://192.168.204.1:5000/v3 - - STX_USERNAME=admin - - STX_PASSWORD=password1 + - OS_AUTH_URL=${OS_AUTH_URL} + - OS_USERNAME=${OS_USERNAME} + - OS_PASSWORD=${OS_PASSWORD} volumes: - ./o2ims:/o2ims - ./o2dms:/o2dms @@ -53,6 +56,31 @@ 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} + volumes: + - ./o2ims:/o2ims + - ./o2dms:/o2dms + - ./o2common:/o2common + - ./tests:/tests + entrypoint: + - /bin/sh + - /o2ims/entrypoints/o2ims-watcher-entry.sh + postgres: image: postgres:9.6 environment: