Merge "OAuth2 support"

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

diff --git a/docker-compose.yml b/docker-compose.yml
index 477441a..a624b56 100644 (file)
--- 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,10 +19,8 @@ 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
+      - CGTS_INSECURE_SSL=1
     volumes:
       - ./configs:/configs
       - ./o2ims:/o2ims
@@ -34,6 +33,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:
@@ -41,7 +57,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,8 +67,11 @@ services:
       - OS_USERNAME=${OS_USERNAME}
       - OS_PASSWORD=${OS_PASSWORD}
       - LOGGING_CONFIG_LEVEL=DEBUG
+      - HELM_USER_PASSWD=St8rlingX*
+      - CGTS_INSECURE_SSL=1
     volumes:
       - ./configs:/configs
+      - ./share:/share
       - ./o2ims:/o2ims
       - ./o2dms:/o2dms
       - ./o2common:/o2common
@@ -61,18 +80,16 @@ services:
       - ./tests:/tests
     entrypoint:
       - /bin/sh
-      - /tests/o2app-api-entry.sh
+      - /tests/o2app-api-entry2.sh
     ports:
       - "5005:80"
 
   watcher:
-    build:
-      context: .
-      dockerfile: Dockerfile.localtest
     image: o2imsdms
     depends_on:
       - redis_pubsub
     environment:
+      - API_HOST_EXTERNAL_FLOATING=${API_HOST_EXTERNAL_FLOATING}
       - DB_HOST=postgres
       - DB_PASSWORD=o2ims123
       - REDIS_HOST=redis
@@ -81,6 +98,7 @@ services:
       - OS_USERNAME=${OS_USERNAME}
       - OS_PASSWORD=${OS_PASSWORD}
       - LOGGING_CONFIG_LEVEL=DEBUG
+      - CGTS_INSECURE_SSL=1
     volumes:
       - ./configs:/configs
       - ./o2ims:/o2ims