diff --git a/dc b/dc index d36a811d..1684c5d6 100755 --- a/dc +++ b/dc @@ -1,7 +1,10 @@ #!/bin/bash if [ -f .env ]; then - OLD_IFS=$IFS; IFS=$'\n'; for x in `grep -v '^#.*' .env`; do export $x; done; IFS=$OLD_IFS + OLD_IFS=$IFS + IFS=$'\n' + for x in $(grep -v '^#.*' .env); do export $x; done + IFS=$OLD_IFS fi # include base docker compose file @@ -15,7 +18,7 @@ for i in $(seq 1 ${#PORTAL_MODULES}); do # blocker module - alias "b" if [[ ${PORTAL_MODULES:i-1:1} == "b" ]]; then - COMPOSE_FILES+=" -f docker-compose.blocker.yml" + COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.blocker.yml" fi # jaeger module - alias "j" @@ -25,10 +28,10 @@ for i in $(seq 1 ${#PORTAL_MODULES}); do # malware-scanner module - alias "s" if [[ ${PORTAL_MODULES:i-1:1} == "s" ]]; then - COMPOSE_FILES+=" -f docker-compose.mongodb.yml -f docker-compose.malware-scanner.yml" + COMPOSE_FILES+=" -f docker-compose.blocker.yml -f docker-compose.mongodb.yml -f docker-compose.malware-scanner.yml" fi - # mongodb module - alias "m". implied by "a" and "c" + # mongodb module - alias "m" if [[ ${PORTAL_MODULES:i-1:1} == "m" ]]; then COMPOSE_FILES+=" -f docker-compose.mongodb.yml" fi diff --git a/docker-compose.malware-scanner.yml b/docker-compose.malware-scanner.yml index 4863ff7c..7995f542 100644 --- a/docker-compose.malware-scanner.yml +++ b/docker-compose.malware-scanner.yml @@ -48,3 +48,4 @@ services: depends_on: - mongo - clamav + - blocker