convert over to docker-compose v2 format, create 'xos' network, to try to get #1850 in faster
use xos_db db host, update other docker-compose files
Change-Id: I7c81b11b9effb0eb89c1eaff515e9901e1096a4a
diff --git a/cord-pod/docker-compose-bootstrap.yml b/cord-pod/docker-compose-bootstrap.yml
index 6325c4b..c145a83 100644
--- a/cord-pod/docker-compose-bootstrap.yml
+++ b/cord-pod/docker-compose-bootstrap.yml
@@ -1,17 +1,32 @@
-xos_db:
+---
+version: '2'
+
+networks:
+ xos:
+ external: true
+
+services:
+ xos_db:
image: xosproject/xos-postgres
+ networks:
+ - xos
expose:
- "5432"
-xos_redis:
+ xos_redis:
image: redis
- log_driver: "json-file"
- log_opt:
- max-size: "1000k"
- max-file: "5"
+ networks:
+ - xos
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1000k"
+ max-file: "5"
-xos_synchronizer_onboarding:
+ xos_synchronizer_onboarding:
image: xosproject/xos
+ networks:
+ - xos
command: bash -c "cd /opt/xos/synchronizers/onboarding; ./run.sh"
#command: sleep 86400
labels:
@@ -25,16 +40,19 @@
- ./onboarding-docker-compose:/opt/xos/synchronizers/onboarding/docker-compose
- ../../xos_services:/opt/xos_services
- ../../xos_libraries:/opt/xos_libraries
- log_driver: "json-file"
- log_opt:
- max-size: "1000k"
- max-file: "5"
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1000k"
+ max-file: "5"
-xos_bootstrap_ui:
+ xos_bootstrap_ui:
command: python /opt/xos/manage.py runserver 0.0.0.0:81 --insecure --makemigrations
environment:
- CONFIG_DIR
image: xosproject/xos
+ networks:
+ - xos
links:
- xos_db
ports:
@@ -47,7 +65,9 @@
- ./admin-openrc.sh:/root/setup/admin-openrc.sh
- ../common/tosca/fixtures.yaml:/opt/xos/bootstrap_tosca/fixtures.yaml
- ./deployment.yaml:/opt/xos/bootstrap_tosca/deployment.yaml
- log_driver: "json-file"
- log_opt:
- max-size: "1000k"
- max-file: "5"
+ logging:
+ driver: "json-file"
+ options:
+ max-size: "1000k"
+ max-file: "5"
+