Release pti-o2imsdms 2.0.1 image

[pti/o2.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 135537e..a3bf256 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -19,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
@@ -35,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:
+  #     - ./share:/share
+  #     - ./helm_sdk:/helm_sdk
+  #     - ./tests:/tests
+  #   entrypoint:
+  #     - /bin/sh
+  #     - /tests/o2app-helmcli-entry.sh
+  #   ports:
+  #     - "10022:22"
+
   api:
     image: o2imsdms
     depends_on:
@@ -42,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
@@ -52,8 +66,10 @@ services:
       - 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
@@ -62,7 +78,7 @@ services:
       - ./tests:/tests
     entrypoint:
       - /bin/sh
-      - /tests/o2app-api-entry.sh
+      - /tests/o2app-api-entry2.sh
     ports:
       - "5005:80"
 
@@ -74,6 +90,7 @@ services:
     depends_on:
       - redis_pubsub
     environment:
+      - API_HOST_EXTERNAL_FLOATING=${API_HOST_EXTERNAL_FLOATING}
       - DB_HOST=postgres
       - DB_PASSWORD=o2ims123
       - REDIS_HOST=redis
@@ -94,31 +111,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:
@@ -131,8 +123,3 @@ services:
     image: redis:alpine
     ports:
       - "63791:6379"
-
-  mock_smo_redis:
-    image: redis:alpine
-    ports:
-      - "63792:6379"