mirror of
https://github.com/getsentry/self-hosted.git
synced 2025-12-08 19:46:14 +00:00
Source install/geoip.sh, to work in more envs (#809)
This commit is contained in:
parent
e7ec11aa3b
commit
8d6893f0bf
@ -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
3
install/docker-aliases.sh
Executable file
@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
dc="docker-compose --no-ansi"
|
||||
dcr="$dc run --rm"
|
||||
@ -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'
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user