Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ref(geoip): Remove geoipupdate from compose #3490

Merged
merged 2 commits into from
Dec 23, 2024
Merged

Conversation

BYK
Copy link
Member

@BYK BYK commented Dec 22, 2024

geoipupdate is not used by any other service nor it is needed for any
service to run. Moreover, it is a one-shot command, causing
docker compose up --wait to fail when it exits with a non-zero status.
This happens when one has not yet set up their credentials and they may
choose to never do this.

This PR removes geoipupdate from the docker-compose.yml file and
moves the command directly into the geoip related script. One may run
this whenever they want to update their GeoIP database.

This PR needs an accompanying docs change.

It also has the side-effect of making integration tests slightly faster (due to the initial docker compose up --wait), and more reliable as we used to rely on the implicit docker compose run web from the sentry_admin test. This also skewed the test run duration of sentry_admin test by including the system startup time there.

`geoipupdate` is not used by any other service nor it is needed for any
service to run. Moreover, it is a one-shot command, causing
`docker compose up --wait` to fail when it exits with a non-zero status.
This happens when one has not yet set up their credentials and they may
choose to never do this.

This PR removes `geoipupdate` from the `docker-compose.yml` file and
moves the command directly into the geoip related script. One may run
this whenever they want to update their GeoIP database.

This PR needs an accompanying docs change.
@BYK BYK requested a review from hubertdeng123 December 22, 2024 19:51
@BYK BYK enabled auto-merge (squash) December 22, 2024 19:52
Copy link

codecov bot commented Dec 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 98.06%. Comparing base (4fa0833) to head (db60eb5).
Report is 2 commits behind head on master.

✅ All tests successful. No failed tests found.

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #3490      +/-   ##
==========================================
- Coverage   99.03%   98.06%   -0.97%     
==========================================
  Files           3        3              
  Lines         207      207              
==========================================
- Hits          205      203       -2     
- Misses          2        4       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@aldy505 aldy505 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't remember which version since Docker introduce the --wait flag. But since most people are likely using the updated version of their Docker & Docker Compose, this should be good to go.

@BYK
Copy link
Member Author

BYK commented Dec 23, 2024

@aldy505 I mean, we test (and support) 2.19 and 2.26 which both seem to support the flag and that's kind of all I care about 😅

@BYK BYK merged commit ad39dab into master Dec 23, 2024
13 of 14 checks passed
@BYK BYK deleted the byk/ref/move-geoipupdate-out branch December 23, 2024 22:32
@github-actions github-actions bot locked and limited conversation to collaborators Jan 8, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants