From d02161776242934b54f97df6ddc19545d693a73e Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Fri, 28 May 2021 16:09:45 +0200 Subject: [PATCH 1/2] use dc command instead of docker-compose directly --- dc | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100755 dc diff --git a/dc b/dc new file mode 100755 index 00000000..5d637d0c --- /dev/null +++ b/dc @@ -0,0 +1,24 @@ +#!/bin/bash + +if [ -f .env ]; then + export $(cat .env | sed 's/#.*//g' | xargs) +fi + +for i in $(seq 1 ${#PORTAL_MODULES}); do + # accounts module - alias "a" + if [ ${PORTAL_MODULES:i-1:1} == "a" ]; then + COMPOSE_FILES+=" -f docker-compose.accounts.yml" + fi + + # jaeger module - alias "j" + if [ ${PORTAL_MODULES:i-1:1} == "j" ]; then + COMPOSE_FILES+=" -f docker-compose.jaeger.yml" + fi +done + +# override file if exists +if [ -f docker-compose.override.yml ]; then + COMPOSE_FILES+=" -f docker-compose.override.yml" +fi + +docker-compose $COMPOSE_FILES $@ From 3ad5b4fa38f6ee51742e548094cd24b32769ed7a Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Fri, 28 May 2021 17:55:15 +0200 Subject: [PATCH 2/2] include basse docker-compose file --- dc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dc b/dc index 5d637d0c..bb86f894 100755 --- a/dc +++ b/dc @@ -4,6 +4,9 @@ if [ -f .env ]; then export $(cat .env | sed 's/#.*//g' | xargs) fi +# include base docker compose file +COMPOSE_FILES="-f docker-compose.yml" + for i in $(seq 1 ${#PORTAL_MODULES}); do # accounts module - alias "a" if [ ${PORTAL_MODULES:i-1:1} == "a" ]; then