mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-09 04:50:59 +00:00
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:
1 parent
635c376d3a
commit
674c6b5b70
2 files changed
+29
-13
No files matched your search
@@ -8,10 +8,12 @@
|
||||
#
|
||||
# The MaxMind GeoLite2 databases require a free MaxMind account and
|
||||
# a licence key. The key is taken from the `MAXMIND_LICENSE_KEY`
|
||||
# environment variable. Without the key, the script exits 0 and the
|
||||
# Docker image builds without the offline databases — the runtime
|
||||
# resolver in `src/lib/geo.ts` falls back to the online `ipwho.is`
|
||||
# provider, which is the v1.4.26 behaviour.
|
||||
# environment variable. Without the key, the script writes an `.empty`
|
||||
# marker into the output directory and exits 0 — the Docker image
|
||||
# still builds (the COPY in `Dockerfile` has a non-empty source) and
|
||||
# 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
|
||||
# Creative Commons Attribution-ShareAlike 4.0
|
||||
@@ -32,10 +34,16 @@ LICENSE_KEY="${MAXMIND_LICENSE_KEY:-}"
|
||||
if [[ -z "$LICENSE_KEY" ]]; then
|
||||
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
|
||||
mkdir -p "$OUT_DIR"
|
||||
touch "$OUT_DIR/.empty"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
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() {
|
||||
local edition_id="$1"
|
||||
|
||||
Reference in new issue
Block a user