X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker-compose.yml;h=ca7301863f849f18c8011d74644ce06562b1a541;hb=94e6f93c3434e5f9a9529246d97d2666a2479299;hp=563ab4bf07561ed2cd2c6a13db89f136a46808a1;hpb=b37a7d8e36bd9fdf862cb1aad29f9a29052e725f;p=pti%2Fo2.git

diff --git a/docker-compose.yml b/docker-compose.yml
index 563ab4b..ca73018 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -11,6 +11,7 @@ services:
       - postgres
       - redis
     environment:
+      - API_HOST=api
       - DB_HOST=postgres
       - DB_PASSWORD=o2ims123
       - REDIS_HOST=redis
@@ -18,9 +19,6 @@ 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
@@ -34,6 +32,23 @@ services:
       - /bin/sh
       - /tests/o2app-redis-entry.sh
 
+  helm_cli:
+    image: o2imsdms
+    depends_on:
+      - watcher
+    environment:
+      - LOGGING_CONFIG_LEVEL=DEBUG
+      - HELM_USER_PASSWD=St8rlingX*
+    volumes:
+      - ./configs:/configs
+      - ./helm_sdk:/helm_sdk
+      - ./tests:/tests
+    entrypoint:
+      - /bin/sh
+      - /tests/o2app-helmcli-entry.sh
+    ports:
+      - "10022:22"
+
   api:
     image: o2imsdms
     depends_on:
@@ -41,7 +56,7 @@ services:
     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=/o2app/entrypoints/flask_application.py
@@ -51,6 +66,7 @@ services:
       - OS_USERNAME=${OS_USERNAME}
       - OS_PASSWORD=${OS_PASSWORD}
       - LOGGING_CONFIG_LEVEL=DEBUG
+      - HELM_USER_PASSWD=St8rlingX*
     volumes:
       - ./configs:/configs
       - ./o2ims:/o2ims
@@ -73,6 +89,7 @@ services:
     depends_on:
       - redis_pubsub
     environment:
+      - API_HOST_EXTERNAL_FLOATING=${API_HOST_EXTERNAL_FLOATING}
       - DB_HOST=postgres
       - DB_PASSWORD=o2ims123
       - REDIS_HOST=redis
@@ -93,31 +110,6 @@ services:
       - /bin/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
     environment:
@@ -130,8 +122,3 @@ services:
     image: redis:alpine
     ports:
       - "63791:6379"
-
-  mock_smo_redis:
-    image: redis:alpine
-    ports:
-      - "63792:6379"