Fix issue and normalize the way configuration

is loaded into docker container running alone
or as part of a cluster

Author: MarcialRosales

selenium/bin/components/rabbitmq

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 init_rabbitmq() {
-  RABBITMQ_CONFIG_DIR=${TESxT_CONFIG_DIR}
+  RABBITMQ_CONFIG_DIR=${TEST_CONFIG_DIR}
   RABBITMQ_DOCKER_IMAGE=${RABBITMQ_DOCKER_IMAGE:-rabbitmq}
 
   print "> RABBITMQ_CONFIG_DIR: ${RABBITMQ_CONFIG_DIR}"
@@ -85,12 +85,10 @@ start_docker_cluster_rabbitmq() {
     kill_container_if_exist rabbitmq2
 
     mkdir -p $CONF_DIR/rabbitmq
-    MOUNT_RABBITMQ_CONF="/etc/rabbitmq/rabbitmq.conf"
-    MOUNT_ADVANCED_CONFIG="/etc/rabbitmq/advanced.config"
 
     RABBITMQ_TEST_DIR="/var/rabbitmq" ${BIN_DIR}/gen-rabbitmq-conf ${RABBITMQ_CONFIG_DIR} $ENV_FILE $CONF_DIR/rabbitmq/rabbitmq.conf
     print "> EFFECTIVE RABBITMQ_CONFIG_FILE: $CONF_DIR/rabbitmq/rabbitmq.conf"
-    ${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /$CONF_DIR/rabbitmq/advanced.config
+    ${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE $CONF_DIR/rabbitmq/advanced.config
     RESULT=$?
     if [ $RESULT -eq 0 ]; then
         if [ -s $RESULT ]; then
@@ -137,25 +135,28 @@ start_docker_rabbitmq() {
   kill_container_if_exist rabbitmq
 
   mkdir -p $CONF_DIR/rabbitmq
-  MOUNT_RABBITMQ_CONF="/etc/rabbitmq/rabbitmq.conf"
-  MOUNT_ADVANCED_CONFIG="/etc/rabbitmq/advanced.config"
 
   RABBITMQ_TEST_DIR="/var/rabbitmq" ${BIN_DIR}/gen-rabbitmq-conf ${RABBITMQ_CONFIG_DIR} $ENV_FILE $CONF_DIR/rabbitmq/rabbitmq.conf
   print "> EFFECTIVE RABBITMQ_CONFIG_FILE: $CONF_DIR/rabbitmq/rabbitmq.conf"
-  ${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE /$CONF_DIR/rabbitmq/advanced.config
+  ${BIN_DIR}/gen-advanced-config ${RABBITMQ_CONFIG_DIR} $ENV_FILE $CONF_DIR/rabbitmq/advanced.config
   RESULT=$?
   if [ $RESULT -eq 0 ]; then
-    print "> EFFECTIVE ADVANCED_CONFIG_FILE: $CONF_DIR/rabbitmq/advanced.config"
-    EXTRA_MOUNTS="-v $CONF_DIR/rabbitmq/advanced.config:${MOUNT_ADVANCED_CONFIG}:ro "
+      if [ -s $RESULT ]; then
+          print "> EFFECTIVE ADVANCED_CONFIG_FILE: $CONF_DIR/rabbitmq/advanced.config"
+      else
+          rm $CONF_DIR/rabbitmq/advanced.config
+      fi
   fi
+  mkdir -p $CONF_DIR/rabbitmq/conf.d/
+  cp ${RABBITMQ_CONFIG_DIR}/logging.conf $CONF_DIR/rabbitmq/conf.d/
   if [ -f ${RABBITMQ_CONFIG_DIR}/enabled_plugins ]; then
-    EXTRA_MOUNTS="$EXTRA_MOUNTS -v ${RABBITMQ_CONFIG_DIR}/enabled_plugins:/etc/rabbitmq/enabled_plugins "
+      cp ${RABBITMQ_CONFIG_DIR}/enabled_plugins $CONF_DIR/rabbitmq
   fi
   if [ -d ${RABBITMQ_CONFIG_DIR}/certs ]; then
-    EXTRA_MOUNTS=" $EXTRA_MOUNTS -v ${RABBITMQ_CONFIG_DIR}/certs:/var/rabbitmq/certs "
+      cp -r ${RABBITMQ_CONFIG_DIR}/certs $CONF_DIR/rabbitmq
   fi
   if [ -d ${RABBITMQ_CONFIG_DIR}/imports ]; then
-    EXTRA_MOUNTS="$EXTRA_MOUNTS -v ${RABBITMQ_CONFIG_DIR}/imports:/var/rabbitmq/imports "
+      cp -r ${RABBITMQ_CONFIG_DIR}/imports $CONF_DIR/rabbitmq
   fi
 
   print "> RABBITMQ_TEST_DIR: /var/rabbitmq"
@@ -168,8 +169,8 @@ start_docker_rabbitmq() {
     -p 5671:5671 \
     -p 15672:15672 \
     -p 15671:15671 \
-    -v ${RABBITMQ_CONFIG_DIR}/logging.conf:/etc/rabbitmq/conf.d/logging.conf:ro \
-    -v $CONF_DIR/rabbitmq/rabbitmq.conf:${MOUNT_RABBITMQ_CONF}:ro \
+    -v $CONF_DIR/rabbitmq/:/etc/rabbitmq \
+    -v $CONF_DIR/rabbitmq/:/var/rabbitmq \
     -v ${TEST_DIR}:/config \
     ${EXTRA_MOUNTS} \
     ${RABBITMQ_DOCKER_IMAGE}