X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=docker-compose.yml;h=135537e5b00b62f59c4e602f83ea2487cc8d6628;hb=955e499773dcfd80e2b5497d3cb1b38c9ae294eb;hp=64334b79d1f7e5027770c6dc4746f9b62194d3d9;hpb=cb9a72de554108746c4ed35f8ad9e0a5550f626d;p=pti%2Fo2.git diff --git a/docker-compose.yml b/docker-compose.yml index 64334b7..135537e 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,16 +19,21 @@ 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 - ./o2ims:/o2ims - ./o2dms:/o2dms - ./o2common:/o2common + - ./o2app:/o2app + - ./helm_sdk:/helm_sdk - ./tests:/tests entrypoint: - /bin/sh - - /tests/o2ims-redis-entry.sh + - /tests/o2app-redis-entry.sh api: image: o2imsdms @@ -39,7 +45,7 @@ services: - API_HOST=api - 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} @@ -51,12 +57,12 @@ services: - ./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-entry.sh ports: - "5005:80" @@ -81,10 +87,37 @@ services: - ./o2ims:/o2ims - ./o2dms:/o2dms - ./o2common:/o2common + - ./o2app:/o2app + - ./helm_sdk:/helm_sdk - ./tests:/tests entrypoint: - /bin/sh - - /tests/o2ims-watcher-entry.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 @@ -98,3 +131,8 @@ services: image: redis:alpine ports: - "63791:6379" + + mock_smo_redis: + image: redis:alpine + ports: + - "63792:6379"