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

diff --git a/docker-compose.yml b/docker-compose.yml
index efb52cf..a3bf256 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,41 +19,66 @@ 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-redis-entry.sh
+      - /tests/o2app-redis-entry.sh
+
+  # helm_cli:
+  #   image: o2imsdms
+  #   depends_on:
+  #     - watcher
+  #   environment:
+  #     - LOGGING_CONFIG_LEVEL=DEBUG
+  #     - HELM_USER_PASSWD=St8rlingX*
+  #   volumes:
+  #     - ./share:/share
+  #     - ./helm_sdk:/helm_sdk
+  #     - ./tests:/tests
+  #   entrypoint:
+  #     - /bin/sh
+  #     - /tests/o2app-helmcli-entry.sh
+  #   ports:
+  #     - "10022:22"
 
   api:
-    image: o2imsdms-image
+    image: o2imsdms
     depends_on:
       - redis_pubsub
     environment:
       - DB_HOST=postgres
       - DB_PASSWORD=o2ims123
-      - API_HOST=api
+      - API_HOST_EXTERNAL_FLOATING=${API_HOST_EXTERNAL_FLOATING}
       - 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
+      - HELM_USER_PASSWD=St8rlingX*
     volumes:
+      - ./configs:/configs
+      - ./share:/share
       - ./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-entry2.sh
     ports:
       - "5005:80"
 
@@ -60,11 +86,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 +98,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