projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
full_install_osm.sh: use the right devops folder for lxd configuration and charm...
[osm/devops.git]
/
installers
/
docker
/
docker-compose.yaml
diff --git
a/installers/docker/docker-compose.yaml
b/installers/docker/docker-compose.yaml
index
44fbea6
..
b3af196
100644
(file)
--- a/
installers/docker/docker-compose.yaml
+++ b/
installers/docker/docker-compose.yaml
@@
-40,10
+40,10
@@
services:
networks:
- netOSM
healthcheck:
networks:
- netOSM
healthcheck:
- test: echo
stat | nc
localhost 2181
- interval:
1
0s
+ test: echo
ruok | nc -w 2
localhost 2181
+ interval:
2
0s
timeout: 10s
timeout: 10s
- retries:
3
+ retries:
5
logging:
driver: "json-file"
options:
logging:
driver: "json-file"
options:
@@
-60,10
+60,15
@@
services:
KAFKA_ADVERTISED_PORT: 9092
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_LOG_RETENTION_HOURS: 24
KAFKA_ADVERTISED_PORT: 9092
KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181
KAFKA_LOG_RETENTION_HOURS: 24
+ KAFKA_BROKER_ID: 1
+ KAFKA_ADVERTISED_LISTENERS: PLAINTEXT://:9092
+ KAFKA_LISTENERS: PLAINTEXT://:9092
+ KAFKA_INTER_BROKER_LISTENER_NAME: PLAINTEXT
+ KAFKA_OFFSETS_TOPIC_REPLICATION_FACTOR: 1
volumes:
- /var/run/docker.sock:/var/run/docker.sock
healthcheck:
volumes:
- /var/run/docker.sock:/var/run/docker.sock
healthcheck:
- test:
zookeeper-shell.sh zookeeper:2181 ls /brokers/ids 2>&1 | grep "Node does not exist" && exit 1 || exit 0
+ test:
echo ruok | nc -w 2 zookeeper 2181
interval: 20s
timeout: 10s
retries: 5
interval: 20s
timeout: 10s
retries: 5
@@
-113,7
+118,7
@@
services:
networks:
- netOSM
keystone:
networks:
- netOSM
keystone:
- image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-
7
}
+ image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-
8
}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-128,7
+133,7
@@
services:
max-size: "100m"
max-file: "2"
nbi:
max-size: "100m"
max-file: "2"
nbi:
- image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-
7
}
+ image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-
8
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-149,7
+154,7
@@
services:
# - kafka
# - mongo
lcm:
# - kafka
# - mongo
lcm:
- image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-
7
}
+ image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-
8
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-187,7
+192,7
@@
services:
# ports:
# - "3306:3306"
ro:
# ports:
# - "3306:3306"
ro:
- image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-
7
}
+ image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-
8
}
networks:
- netOSM
environment:
networks:
- netOSM
environment:
@@
-206,7
+211,7
@@
services:
max-size: "100m"
max-file: "2"
mon:
max-size: "100m"
max-file: "2"
mon:
- image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-
7
}
+ image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-
8
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-226,7
+231,7
@@
services:
max-file: 5
max-size: 10m
pol:
max-file: 5
max-size: 10m
pol:
- image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-
7
}
+ image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-
8
}
networks:
- netOSM
volumes:
networks:
- netOSM
volumes:
@@
-245,7
+250,7
@@
services:
max-file: 5
max-size: 10m
light-ui:
max-file: 5
max-size: 10m
light-ui:
- image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-
7
}
+ image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-
8
}
networks:
- netOSM
environment:
networks:
- netOSM
environment: