Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix INF-342 refactor deploymentManager profile data
[pti/o2.git]
/
docker-compose.yml
diff --git
a/docker-compose.yml
b/docker-compose.yml
index
477441a
..
ca73018
100644
(file)
--- a/
docker-compose.yml
+++ b/
docker-compose.yml
@@
-11,6
+11,7
@@
services:
- postgres
- redis
environment:
- postgres
- redis
environment:
+ - API_HOST=api
- DB_HOST=postgres
- DB_PASSWORD=o2ims123
- REDIS_HOST=redis
- 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}
- 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
- LOGGING_CONFIG_LEVEL=DEBUG
volumes:
- ./configs:/configs
@@
-34,6
+32,23
@@
services:
- /bin/sh
- /tests/o2app-redis-entry.sh
- /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:
api:
image: o2imsdms
depends_on:
@@
-41,7
+56,7
@@
services:
environment:
- DB_HOST=postgres
- DB_PASSWORD=o2ims123
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
- 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
- OS_USERNAME=${OS_USERNAME}
- OS_PASSWORD=${OS_PASSWORD}
- LOGGING_CONFIG_LEVEL=DEBUG
+ - HELM_USER_PASSWD=St8rlingX*
volumes:
- ./configs:/configs
- ./o2ims:/o2ims
volumes:
- ./configs:/configs
- ./o2ims:/o2ims
@@
-73,6
+89,7
@@
services:
depends_on:
- redis_pubsub
environment:
depends_on:
- redis_pubsub
environment:
+ - API_HOST_EXTERNAL_FLOATING=${API_HOST_EXTERNAL_FLOATING}
- DB_HOST=postgres
- DB_PASSWORD=o2ims123
- REDIS_HOST=redis
- DB_HOST=postgres
- DB_PASSWORD=o2ims123
- REDIS_HOST=redis