Merge "OAuth2 support"

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

diff --git a/docker-compose.yml b/docker-compose.yml
index eae9a94..a624b56 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,7 @@ services:
       - OS_USERNAME=${OS_USERNAME}
       - OS_PASSWORD=${OS_PASSWORD}
       - LOGGING_CONFIG_LEVEL=DEBUG
+      - CGTS_INSECURE_SSL=1
     volumes:
       - ./configs:/configs
       - ./o2ims:/o2ims
@@ -32,22 +33,22 @@ 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"
+  # 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
@@ -67,8 +68,10 @@ services:
       - 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
@@ -82,9 +85,6 @@ services:
       - "5005:80"
 
   watcher:
-    build:
-      context: .
-      dockerfile: Dockerfile.localtest
     image: o2imsdms
     depends_on:
       - redis_pubsub
@@ -98,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