LumeWeb
/
skynet-webportal
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for osx and vars that contain spaces (#825)

This commit is contained in:
Karol Wypchło 2021-05-31 14:36:47 +02:00 committed by GitHub
parent f96a22082d
commit 7529c2c2c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dc
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
if [ -f .env ]; then if [ -f .env ]; then
export $(cat .env | sed 's/#.*//g' | xargs) OLD_IFS=$IFS; IFS=$'\n'; for x in `grep -v '^#.*' .env`; do export $x; done; IFS=$OLD_IFS
fi fi
# include base docker compose file # include base docker compose file
@ -9,18 +9,18 @@ COMPOSE_FILES="-f docker-compose.yml"
for i in $(seq 1 ${#PORTAL_MODULES}); do for i in $(seq 1 ${#PORTAL_MODULES}); do
# accounts module - alias "a" # accounts module - alias "a"
if [ ${PORTAL_MODULES:i-1:1} == "a" ]; then if [[ ${PORTAL_MODULES:i-1:1} == "a" ]]; then
COMPOSE_FILES+=" -f docker-compose.accounts.yml" COMPOSE_FILES+=" -f docker-compose.accounts.yml"
fi fi
# jaeger module - alias "j" # jaeger module - alias "j"
if [ ${PORTAL_MODULES:i-1:1} == "j" ]; then if [[ ${PORTAL_MODULES:i-1:1} == "j" ]]; then
COMPOSE_FILES+=" -f docker-compose.jaeger.yml" COMPOSE_FILES+=" -f docker-compose.jaeger.yml"
fi fi
done done
# override file if exists # override file if exists
if [ -f docker-compose.override.yml ]; then if [[ -f docker-compose.override.yml ]]; then
COMPOSE_FILES+=" -f docker-compose.override.yml" COMPOSE_FILES+=" -f docker-compose.override.yml"
fi fi