Source install/geoip.sh, to work in more envs (#809)

This commit is contained in:
Chad Whitacre 2021-01-13 11:28:00 -05:00 committed by GitHub
parent e7ec11aa3b
commit 8d6893f0bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 6 deletions

View File

@ -9,8 +9,7 @@ fi
# Read .env for default values with a tip o' the hat to https://stackoverflow.com/a/59831605/90297
t=$(mktemp) && export -p > "$t" && set -a && . ./.env && set +a && . "$t" && rm "$t" && unset t
dc="docker-compose --no-ansi"
dcr="$dc run --rm"
source ./install/docker-aliases.sh
# Thanks to https://unix.stackexchange.com/a/145654/108960
log_file="sentry_install_log-`date +'%Y-%m-%d_%H-%M-%S'`.txt"
@ -329,7 +328,7 @@ if [[ ! -f "$RELAY_CREDENTIALS_JSON" ]]; then
fi
./install/geoip.sh
source ./install/geoip.sh
if [[ "$MINIMIZE_DOWNTIME" ]]; then

3
install/docker-aliases.sh Executable file
View File

@ -0,0 +1,3 @@
#!/usr/bin/env bash
dc="docker-compose --no-ansi"
dcr="$dc run --rm"

View File

@ -2,9 +2,7 @@
if [ ! -f 'install.sh' ]; then echo 'Where are you?'; exit 1; fi
dc="docker-compose --no-ansi"
dcr="$dc run --rm"
source ./install/docker-aliases.sh
install_geoip() {
local mmdb='geoip/GeoLite2-City.mmdb'