Skip to content

Commit 35116d7

Browse files
committed
remove geoipupdate from compose
1 parent f951609 commit 35116d7

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

docker-compose.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -207,15 +207,6 @@ services:
207207
interval: 10s
208208
timeout: 10s
209209
retries: 30
210-
geoipupdate:
211-
image: "ghcr.io/maxmind/geoipupdate:v6.1.0"
212-
# Override the entrypoint in order to avoid using envvars for config.
213-
# Futz with settings so we can keep mmdb and conf in same dir on host
214-
# (image looks for them in separate dirs by default).
215-
entrypoint:
216-
["/usr/bin/geoipupdate", "-d", "/sentry", "-f", "/sentry/GeoIP.conf"]
217-
volumes:
218-
- "./geoip:/sentry"
219210
snuba-api:
220211
<<: *snuba_defaults
221212
# Kafka consumer responsible for feeding events into Clickhouse

install/geoip.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ install_geoip() {
2121
else
2222
echo "IP address geolocation is configured for updates."
2323
echo "Updating IP address geolocation database ... "
24-
if ! $dcr geoipupdate; then
24+
if ! docker run --rm -v "./geoip:/sentry" --entrypoint '/usr/bin/geoipupdate' "ghcr.io/maxmind/geoipupdate:v6.1.0" "-d" "/sentry" "-f" "/sentry/GeoIP.conf"; then
2525
result='Error'
2626
fi
2727
echo "$result updating IP address geolocation database."

0 commit comments

Comments
 (0)