projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use docker tag 5 instead of latest
[osm/devops.git]
/
installers
/
docker
/
docker-compose.yaml
diff --git
a/installers/docker/docker-compose.yaml
b/installers/docker/docker-compose.yaml
index
b37e381
..
f608262
100644
(file)
--- a/
installers/docker/docker-compose.yaml
+++ b/
installers/docker/docker-compose.yaml
@@
-6,7
+6,6
@@
volumes:
mon_db:
pol_db:
osm_packages:
mon_db:
pol_db:
osm_packages:
- keystone_db:
prom_db:
networks:
netOSM:
prom_db:
networks:
netOSM:
@@
-37,6
+36,7
@@
services:
KAFKA_ADVERTISED_HOST_NAME: kafka
KAFKA_ADVERTISED_PORT: 9092
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_ADVERTISED_HOST_NAME: kafka
KAFKA_ADVERTISED_PORT: 9092
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
+ KAFKA_LOG_RETENTION_HOURS: 24
volumes:
- /var/run/docker.sock:/var/run/docker.sock
#depends_on:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
#depends_on:
@@
-59,28
+59,18
@@
services:
- prom_db:/prometheus
networks:
- netOSM
- prom_db:/prometheus
networks:
- netOSM
- keystone-db:
- image: mariadb:10
- networks:
- - netOSM
- volumes:
- - keystone_db:/var/lib/mysql
- env_file:
- - ./keystone-db.env
-# ports:
-# - "3306:3306"
keystone:
keystone:
- image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-
latest
}
+ image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-
5
}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
- DB_HOST:
keystone-db
+ DB_HOST:
mysql
env_file:
- ./keystone.env
ports:
- "${OSM_KEYSTONE_PORTS:-5000:5000}"
nbi:
env_file:
- ./keystone.env
ports:
- "${OSM_KEYSTONE_PORTS:-5000:5000}"
nbi:
- image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-
latest
}
+ image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-
5
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-96,7
+86,7
@@
services:
# - kafka
# - mongo
lcm:
# - kafka
# - mongo
lcm:
- image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-
latest
}
+ image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-
5
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-111,10
+101,12
@@
services:
# - kafka
# - mongo
# - ro
# - kafka
# - mongo
# - ro
-
ro-db
:
+
mysql
:
image: mysql:5
networks:
image: mysql:5
networks:
- - netOSM
+ netOSM:
+ aliases:
+ - ro-db
volumes:
- ro_db:/var/lib/mysql
env_file:
volumes:
- ro_db:/var/lib/mysql
env_file:
@@
-122,48
+114,60
@@
services:
# ports:
# - "3306:3306"
ro:
# ports:
# - "3306:3306"
ro:
- image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-
latest
}
+ image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-
5
}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
- RO_DB_HOST:
ro-db
+ RO_DB_HOST:
mysql
env_file:
- ./ro.env
#depends_on:
env_file:
- ./ro.env
#depends_on:
- # -
ro-db
+ # -
mysql
volumes:
- ro:/var/log/osm
ports:
- "${OSM_RO_PORTS:-9090:9090}"
mon:
volumes:
- ro:/var/log/osm
ports:
- "${OSM_RO_PORTS:-9090:9090}"
mon:
- image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-
latest
}
+ image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-
5
}
networks:
- netOSM
volumes:
- mon_db:/app/database
environment:
networks:
- netOSM
volumes:
- mon_db:/app/database
environment:
- BROKER_URI: kafka:9092
- DATABASE: sqlite:///app/database/mon_sqlite.db
+ OSMMON_MESSAGE_HOST: kafka
+ OSMMON_MESSAGE_PORT: 9092
env_file:
- ./mon.env
ports:
- "${OSM_MON_PORTS:-8662:8662}"
#depends_on:
# - kafka
env_file:
- ./mon.env
ports:
- "${OSM_MON_PORTS:-8662:8662}"
#depends_on:
# - kafka
+ logging:
+ driver: "json-file"
+ options:
+ max-file: 5
+ max-size: 10m
pol:
pol:
- image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-
latest
}
+ image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-
5
}
networks:
- netOSM
volumes:
- pol_db:/app/database
environment:
networks:
- netOSM
volumes:
- pol_db:/app/database
environment:
- OSMPOL_SQL_DATABASE_URI: sqlite:///app/database/policy_module.db
- BROKER_URI: kafka:9092
+ OSMPOL_MESSAGE_HOST: kafka
+ OSMPOL_MESSAGE_PORT: 9092
+ env_file:
+ - ./pol.env
#depends_on:
# - kafka
# - mon
#depends_on:
# - kafka
# - mon
+ logging:
+ driver: "json-file"
+ options:
+ max-file: 5
+ max-size: 10m
light-ui:
light-ui:
- image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-
latest
}
+ image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-
5
}
networks:
- netOSM
environment:
networks:
- netOSM
environment: