@@ -54,9 +54,9 @@ start_local_rabbitmq() {
54
54
start_docker_cluster_rabbitmq () {
55
55
begin " Starting rabbitmq cluster in docker ..."
56
56
init_rabbitmq
57
- kill_container_if_exist rmq0
58
- kill_container_if_exist rmq1
59
- kill_container_if_exist rmq2
57
+ kill_container_if_exist rabbitmq- rmq0-1
58
+ kill_container_if_exist rabbitmq- rmq1-1
59
+ kill_container_if_exist rabbitmq- rmq2-1
60
60
61
61
mkdir -p $CONF_DIR /rabbitmq
62
62
MOUNT_RABBITMQ_CONF=" /etc/rabbitmq/rabbitmq.conf"
@@ -67,8 +67,11 @@ start_docker_cluster_rabbitmq() {
67
67
${BIN_DIR} /gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /$CONF_DIR /rabbitmq/advanced.config
68
68
RESULT=$?
69
69
if [ $RESULT -eq 0 ]; then
70
- print " > EFFECTIVE ADVANCED_CONFIG_FILE: $CONF_DIR /rabbitmq/advanced.config"
71
- EXTRA_MOUNTS=" -v $CONF_DIR /rabbitmq/advanced.config:${MOUNT_ADVANCED_CONFIG} :ro "
70
+ if [ -s $RESULT ]; then
71
+ print " > EFFECTIVE ADVANCED_CONFIG_FILE: $CONF_DIR /rabbitmq/advanced.config"
72
+ else
73
+ rm $CONF_DIR /rabbitmq/advanced.config
74
+ fi
72
75
fi
73
76
mkdir -p $CONF_DIR /rabbitmq/conf.d/
74
77
cp ${RABBITMQ_CONFIG_DIR} /logging.conf $CONF_DIR /rabbitmq/conf.d/
@@ -79,19 +82,26 @@ start_docker_cluster_rabbitmq() {
79
82
cp -r ${RABBITMQ_CONFIG_DIR} /certs $CONF_DIR /rabbitmq
80
83
fi
81
84
if [ -d ${RABBITMQ_CONFIG_DIR} /imports ]; then
82
- cp -r ${RABBITMQ_CONFIG_DIR} /certs $CONF_DIR /rabbitmq
85
+ cp -r ${RABBITMQ_CONFIG_DIR} /imports $CONF_DIR /rabbitmq
83
86
fi
84
87
85
- cat > $CONF_DIR /rabbitmq/compose.yml << EOF
86
- x-rabbitmq_volumes: &rabbitmq_volumes
87
- - $CONF_DIR /rabbitmq/:/etc/rabbitmq
88
- - $CONF_DIR /rabbitmq/:/var/rabbitmq
88
+ cat > $CONF_DIR /rabbitmq/image_compose.yml << EOF
89
+ x-rabbitmq_image: &rabbitmq_image
90
+ image: ${RABBITMQ_DOCKER_IMAGE}
91
+ volumes:
92
+ - $CONF_DIR /rabbitmq/:/etc/rabbitmq
93
+ - $CONF_DIR /rabbitmq/:/var/rabbitmq
89
94
EOF
95
+ cat $CONF_DIR /rabbitmq/image_compose.yml > $CONF_DIR /rabbitmq/compose.yml
90
96
cat ${BIN_DIR} /components/rabbit-compose.yml >> $CONF_DIR /rabbitmq/compose.yml
91
97
92
- print " Generated docker compose "
93
- cat $CONF_DIR /rabbitmq/compose.yml
98
+ docker-compose -f $CONF_DIR /rabbitmq/ compose.yml \
99
+ up -d
94
100
101
+ wait_for_message rabbitmq-rmq0-1 " Server startup complete"
102
+ wait_for_message rabbitmq-rmq1-1 " Server startup complete"
103
+ wait_for_message rabbitmq-rmq2-1 " Server startup complete"
104
+ end " RabbitMQ ready"
95
105
}
96
106
97
107
start_docker_rabbitmq () {
0 commit comments