X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker-compose.yml;h=477441a1ac624d33419d195551a48232b68fd5ed;hb=0daf5c4f160ec3fde4eb849fbd59ff75eff8e76c;hp=c7ca8b70d13791ab0b9deda4688c932cd1bd4564;hpb=8be81dfad35b08c4de77168e885bb18253069771;p=pti%2Fo2.git

diff --git a/docker-compose.yml b/docker-compose.yml
index c7ca8b7..477441a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.localtest
-    image: o2imsdms-image
+    image: o2imsdms
     depends_on:
       - postgres
       - redis
@@ -18,17 +18,24 @@ services:
       - OS_AUTH_URL=${OS_AUTH_URL}
       - OS_USERNAME=${OS_USERNAME}
       - OS_PASSWORD=${OS_PASSWORD}
+      - K8S_KUBECONFIG=${K8S_KUBECONFIG}
+      - K8S_APISERVER=${K8S_APISERVER}
+      - K8S_TOKEN=${K8S_TOKEN}
+      - LOGGING_CONFIG_LEVEL=DEBUG
     volumes:
+      - ./configs:/configs
       - ./o2ims:/o2ims
       - ./o2dms:/o2dms
       - ./o2common:/o2common
+      - ./o2app:/o2app
+      - ./helm_sdk:/helm_sdk
       - ./tests:/tests
     entrypoint:
-      - python
-      - /o2ims/entrypoints/redis_eventconsumer.py
+      - /bin/sh
+      - /tests/o2app-redis-entry.sh
 
   api:
-    image: o2imsdms-image
+    image: o2imsdms
     depends_on:
       - redis_pubsub
     environment:
@@ -37,22 +44,24 @@ services:
       - API_HOST=api
       - REDIS_HOST=redis
       - PYTHONDONTWRITEBYTECODE=1
-      - FLASK_APP=/o2ims/entrypoints/flask_application.py
+      - FLASK_APP=/o2app/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:
+      - ./configs:/configs
       - ./o2ims:/o2ims
       - ./o2dms:/o2dms
       - ./o2common:/o2common
+      - ./o2app:/o2app
+      - ./helm_sdk:/helm_sdk
       - ./tests:/tests
     entrypoint:
-      - flask
-      - run
-      - --host=0.0.0.0
-      - --port=80
+      - /bin/sh
+      - /tests/o2app-api-entry.sh
     ports:
       - "5005:80"
 
@@ -60,10 +69,9 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.localtest
-    image: o2imsdms-image
+    image: o2imsdms
     depends_on:
-      - postgres
-      - redis
+      - redis_pubsub
     environment:
       - DB_HOST=postgres
       - DB_PASSWORD=o2ims123
@@ -72,14 +80,18 @@ services:
       - 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
+      - ./o2app:/o2app
+      - ./helm_sdk:/helm_sdk
       - ./tests:/tests
     entrypoint:
       - /bin/sh
-      - /o2ims/entrypoints/o2ims-watcher-entry.sh
+      - /tests/o2app-watcher-entry.sh
 
   postgres:
     image: postgres:9.6