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

diff --git a/docker-compose.yml b/docker-compose.yml
index c7ca8b7..962d36d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,11 +6,12 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.localtest
-    image: o2imsdms-image
+    image: o2imsdms
     depends_on:
       - postgres
       - redis
     environment:
+      - API_HOST=api
       - DB_HOST=postgres
       - DB_PASSWORD=o2ims123
       - REDIS_HOST=redis
@@ -18,17 +19,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 +45,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,11 +70,11 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.localtest
-    image: o2imsdms-image
+    image: o2imsdms
     depends_on:
-      - postgres
-      - redis
+      - redis_pubsub
     environment:
+      - API_HOST_EXTERNAL_FLOATING=${API_HOST_EXTERNAL_FLOATING}
       - DB_HOST=postgres
       - DB_PASSWORD=o2ims123
       - REDIS_HOST=redis
@@ -72,14 +82,43 @@ 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
+
+  mock_smo:
+    build:
+      context: ./mock_smo
+      dockerfile: Dockerfile
+    image: mock-smo
+    depends_on:
+      - mock_smo_redis
+    environment:
+      - API_HOST=api
+      - REDIS_HOST=mock_smo_redis
+      - MOCK_SMO_HOST=mock_smo
+      - PYTHONDONTWRITEBYTECODE=1
+      - FLASK_APP=/mock_smo/entrypoints/mock_smo.py
+      - FLASK_DEBUG=1
+      - PYTHONUNBUFFERED=1
+      - LOGGING_CONFIG_LEVEL=DEBUG
+    volumes:
+      - ./mock_smo/etc:/tmp/etc
+      - ./mock_smo/mock_smo:/mock_smo
+    entrypoint:
+      - /bin/sh
+      - /src/o2app-mock-smo.sh
+    ports:
+      - "5001:80"
 
   postgres:
     image: postgres:9.6
@@ -93,3 +132,8 @@ services:
     image: redis:alpine
     ports:
       - "63791:6379"
+
+  mock_smo_redis:
+    image: redis:alpine
+    ports:
+      - "63792:6379"