set default RABBITMQ_URI

Author: bingzhang

Dockerfile

@@ -1,15 +1,10 @@
 FROM ubuntu:16.04
 
 # environment variables
-ENV RABBITMQ_URI="" \
+ENV RABBITMQ_URI="amqp://guest:guest@rabbitmq:5672/%2F" \
     RABBITMQ_EXCHANGE="clowder" \
     RABBITMQ_QUEUE="" \
     REGISTRATION_ENDPOINTS="https://clowder.ncsa.illinois.edu/extractors" \
-    RABBITMQ_USERNAME="guest"\
-    RABBITMQ_PASSWD="guest"\
-    RABBITMQ_PORT_5672_TCP_ADDR="rabbitmq"\
-    RABBITMQ_PORT_5672_TCP_PORT="5672"\
-    RABBITMQ_VHOST="%2F"\
     MAIN_SCRIPT=""
 
 # install python

entrypoint.sh

@@ -1,34 +1,14 @@
 #!/bin/bash
 set -e
 
-# use rabbitmq env variables to construct RABBITMQ_URI.
+# rabbitmq
 if [ "${RABBITMQ_URI}" == "" ]; then
 
-    # if empty, then set to default rabbitmq username
-    if [ "$RABBITMQ_USERNAME" == "" ]; then
-        RABBITMQ_USERNAME="guest"
-    fi
-    # if empty, then set to default rabbitmq passwd
-    if [ "$RABBITMQ_PASSWD" == "" ]; then
-        RABBITMQ_PASSWD="guest"
-    fi
-    # if empty, then set to default rabbitmq hostname
-    if [ "$RABBITMQ_PORT_5672_TCP_ADDR" == "" ]; then
-        RABBITMQ_PORT_5672_TCP_ADDR="rabbitmq"
-    fi
-    # if empty, then set to default rabbitmq port
-    if [ "$RABBITMQ_PORT_5672_TCP_PORT" == "" ]; then
-        RABBITMQ_PORT_5672_TCP_PORT="5672"
-    fi
-    # if empty, then set to default rabbitmq vhost
-    if [ "$RABBITMQ_VHOST" == "" ]; then
-        RABBITMQ_VHOST="%2F"
-    fi
-
     # configure RABBITMQ_URI if started using docker-compose or --link flag
-    RABBITMQ_URI="amqp://${RABBITMQ_USERNAME}:${RABBITMQ_PASSWD}@${RABBITMQ_PORT_5672_TCP_ADDR}:${RABBITMQ_PORT_5672_TCP_PORT}/${RABBITMQ_VHOST}"
+    if [ -n "${RABBITMQ_PORT_5672_TCP_ADDR}" ]; then
+        RABBITMQ_URI="amqp://${RABBITMQ_PORT_5672_TCP_ADDR}:${RABBITMQ_PORT_5672_TCP_PORT}/%2F"
+    fi
 fi
-#TODO, else branch, if RABBITMQ_URI is not empty, then pasrse RABBITMQ_URI to set rabbitmq envs.
 
 # start server if asked
 if [ "$1" = 'extractor' ]; then