X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker-compose.yml;h=efb52cf16eabe3d8c2b7b7cb337824274333b092;hb=cbe50abd06ae2160acd8b48e39d8c6b96325f3c1;hp=255fbd9aa511890fc2e38ad8259d3847868f9a89;hpb=81e3575a77366f30c2049f98c48a3087db0ea992;p=pti%2Fo2.git

diff --git a/docker-compose.yml b/docker-compose.yml
index 255fbd9..efb52cf 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,14 +15,17 @@ 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
       - ./o2common:/o2common
       - ./tests:/tests
     entrypoint:
-      - python
-      - /o2ims/entrypoints/redis_eventconsumer.py
+      - /bin/sh
+      - /o2ims/entrypoints/o2ims-redis-entry.sh
 
   api:
     image: o2imsdms-image
@@ -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: