fix(ci): soften the GeoLite2 fetch guard so the build never blocks on a missing license key

Replace the hard exit 1 in the `Fetch GeoLite2 databases` step with a
`::warning::` line plus a `.empty` marker in `assets/geolite2/`. The
Dockerfile COPY still has a non-empty source, the build continues, and
the runtime detection layer (next commit) picks up the marker on first
geo lookup and emits a one-shot admin notification. The maintainer is
no longer forced to wire `MAXMIND_LICENSE_KEY` before every release.

`scripts/fetch-geolite2.sh` mirrors the same behaviour: when the key is
unset it drops the marker and exits 0 cleanly; when the key is present
it clears any stale marker before downloading so a freshly populated
directory is not misread as the fallback state.
This commit is contained in:
Marc-André Bombeck committed 2026-05-15 22:05:32 +02:00
1 parent 635c376d3a
commit 674c6b5b70
2 files changed
+29 -13

No files matched your search

+17 -9
View File
@@ -101,20 +101,28 @@ jobs:
# v1.4.27 B3 — GeoLite2-City + GeoLite2-ASN databases are too large # v1.4.27 B3 — GeoLite2-City + GeoLite2-ASN databases are too large
# (~80 MB combined) to vendor in git. `scripts/fetch-geolite2.sh` # (~80 MB combined) to vendor in git. `scripts/fetch-geolite2.sh`
# downloads both editions into `assets/geolite2/` so the Dockerfile # downloads both editions into `assets/geolite2/` so the Dockerfile
# COPY at line 78 picks them up. Without the secret the script # COPY at line 78 picks them up.
# would silently exit 0, the COPY would land an empty directory, #
# and the runtime resolver in `src/lib/geo.ts` would fall back to # The build is intentionally resilient to a missing
# the online `ipwho.is` provider — i.e. the offline geo feature # `MAXMIND_LICENSE_KEY` secret: when the key is unset we emit a
# would ship dead. Fail fast instead so the missing-secret state # `::warning::` line, drop a `.empty` marker into the assets
# is visible on the next release run, the same shape the Coolify # directory so the Dockerfile COPY still has a non-empty source,
# auto-deploy step (line 246) adopted in v1.4.26 P6-3. # and continue cleanly. The runtime resolver in `src/lib/geo.ts`
# detects the marker on first lookup and emits a one-shot
# admin notification — the maintainer hears about the gap from
# the running app rather than from a red CI badge that blocks
# every release. To enable the offline feature, set the secret
# under repo Settings → Secrets and variables → Actions and
# redeploy.
- name: Fetch GeoLite2 databases - name: Fetch GeoLite2 databases
env: env:
MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }} MAXMIND_LICENSE_KEY: ${{ secrets.MAXMIND_LICENSE_KEY }}
run: | run: |
if [ -z "$MAXMIND_LICENSE_KEY" ]; then if [ -z "$MAXMIND_LICENSE_KEY" ]; then
echo "::error::MAXMIND_LICENSE_KEY secret is missing. Set it under repo Settings → Secrets and variables → Actions → Secrets so the offline GeoLite2 databases land in the image. Without it the runtime resolver falls back to the online ipwho.is provider and the offline geo feature ships dead." echo "::warning::MAXMIND_LICENSE_KEY secret is unset. The image will ship without the offline GeoLite2 databases; the runtime resolver continues to fall back to the online ipwho.is provider and will send a one-shot admin notification on first use. To enable the offline tier, set MAXMIND_LICENSE_KEY under repo Settings → Secrets and variables → Actions."
exit 1 mkdir -p assets/geolite2
touch assets/geolite2/.empty
exit 0
fi fi
./scripts/fetch-geolite2.sh ./scripts/fetch-geolite2.sh
+12 -4
View File
@@ -8,10 +8,12 @@
# #
# The MaxMind GeoLite2 databases require a free MaxMind account and # The MaxMind GeoLite2 databases require a free MaxMind account and
# a licence key. The key is taken from the `MAXMIND_LICENSE_KEY` # a licence key. The key is taken from the `MAXMIND_LICENSE_KEY`
# environment variable. Without the key, the script exits 0 and the # environment variable. Without the key, the script writes an `.empty`
# Docker image builds without the offline databases — the runtime # marker into the output directory and exits 0 — the Docker image
# resolver in `src/lib/geo.ts` falls back to the online `ipwho.is` # still builds (the COPY in `Dockerfile` has a non-empty source) and
# provider, which is the v1.4.26 behaviour. # the runtime resolver in `src/lib/geo.ts` detects the marker, falls
# back to the online `ipwho.is` provider, and emits a one-shot admin
# notification so the maintainer can wire the secret when convenient.
# #
# Licence: the databases are distributed under # Licence: the databases are distributed under
# Creative Commons Attribution-ShareAlike 4.0 # Creative Commons Attribution-ShareAlike 4.0
@@ -32,10 +34,16 @@ LICENSE_KEY="${MAXMIND_LICENSE_KEY:-}"
if [[ -z "$LICENSE_KEY" ]]; then if [[ -z "$LICENSE_KEY" ]]; then
echo "fetch-geolite2: MAXMIND_LICENSE_KEY is not set — skipping download." >&2 echo "fetch-geolite2: MAXMIND_LICENSE_KEY is not set — skipping download." >&2
echo "fetch-geolite2: the runtime resolver will fall back to ipwho.is." >&2 echo "fetch-geolite2: the runtime resolver will fall back to ipwho.is." >&2
mkdir -p "$OUT_DIR"
touch "$OUT_DIR/.empty"
exit 0 exit 0
fi fi
mkdir -p "$OUT_DIR" mkdir -p "$OUT_DIR"
# Clear any stale marker from a previous keyless run so the runtime
# resolver does not mistake a freshly populated directory for the
# fallback state.
rm -f "$OUT_DIR/.empty"
fetch_edition() { fetch_edition() {
local edition_id="$1" local edition_id="$1"