Skip to content

Commit 3a9d800

Browse files
committed
add default rabbitmq env variables in Dockerfile, add logic to construct RABBITMQ_URI if RABBITMQ_URI is not specified
1 parent 0553eef commit 3a9d800

File tree

2 files changed

+29
-4
lines changed

2 files changed

+29
-4
lines changed

Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ ENV RABBITMQ_URI="" \
55
RABBITMQ_EXCHANGE="clowder" \
66
RABBITMQ_QUEUE="" \
77
REGISTRATION_ENDPOINTS="https://clowder.ncsa.illinois.edu/extractors" \
8+
RABBITMQ_USERNAME="guest"\
9+
RABBITMQ_PASSWD="guest"\
10+
RABBITMQ_PORT_5672_TCP_ADDR="rabbitmq"\
11+
RABBITMQ_PORT_5672_TCP_PORT="5672"\
12+
RABBITMQ_VHOST="%2F"\
813
MAIN_SCRIPT=""
914

1015
# install python

entrypoint.sh

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,34 @@
11
#!/bin/bash
22
set -e
33

4-
# rabbitmq
4+
# use rabbitmq env variables to construct RABBITMQ_URI.
55
if [ "${RABBITMQ_URI}" == "" ]; then
66

7-
# configure RABBITMQ_URI if started using docker-compose or --link flag
8-
if [ -n "${RABBITMQ_PORT_5672_TCP_ADDR}" ]; then
9-
RABBITMQ_URI="amqp://${RABBITMQ_PORT_5672_TCP_ADDR}:${RABBITMQ_PORT_5672_TCP_PORT}/%2F"
7+
# if empty, then set to default rabbitmq username
8+
if [ "$RABBITMQ_USERNAME" == "" ]; then
9+
RABBITMQ_USERNAME="guest"
10+
fi
11+
# if empty, then set to default rabbitmq passwd
12+
if [ "$RABBITMQ_PASSWD" == "" ]; then
13+
RABBITMQ_PASSWD="guest"
14+
fi
15+
# if empty, then set to default rabbitmq hostname
16+
if [ "$RABBITMQ_PORT_5672_TCP_ADDR" == "" ]; then
17+
RABBITMQ_PORT_5672_TCP_ADDR="rabbitmq"
18+
fi
19+
# if empty, then set to default rabbitmq port
20+
if [ "$RABBITMQ_PORT_5672_TCP_PORT" == "" ]; then
21+
RABBITMQ_PORT_5672_TCP_PORT="5672"
1022
fi
23+
# if empty, then set to default rabbitmq vhost
24+
if [ "$RABBITMQ_VHOST" == "" ]; then
25+
RABBITMQ_VHOST="%2F"
26+
fi
27+
28+
# configure RABBITMQ_URI if started using docker-compose or --link flag
29+
RABBITMQ_URI="amqp://${RABBITMQ_USERNAME}:${RABBITMQ_PASSWD}@${RABBITMQ_PORT_5672_TCP_ADDR}:${RABBITMQ_PORT_5672_TCP_PORT}/${RABBITMQ_VHOST}"
1130
fi
31+
#TODO, else branch, if RABBITMQ_URI is not empty, then pasrse RABBITMQ_URI to set rabbitmq envs.
1232

1333
# start server if asked
1434
if [ "$1" = 'extractor' ]; then

0 commit comments

Comments
 (0)