diff --git a/README-DE.md b/README-DE.md index 711e18c..3ddd99f 100644 --- a/README-DE.md +++ b/README-DE.md @@ -48,7 +48,7 @@ Container-Stack für GNU Taler (Exchange, Merchant, LibEuFin Bank) mit optionale - Nach Passwortänderungen in `.env` ist kein manuelles SQL-Rendering nötig; das Init-Skript liest sie beim Start. - Release-Refs/Tarballs: Tags/Commits unter `https://git.taler.net/{gnunet,exchange,merchant,libeufin}.git/` ansehen (Tarballs via `.../snapshot/.tar.gz`) und `*_REF`/`GNUNET_TARBALL_URL` entsprechend setzen. - Offline-Tarballs: Lege Tarballs unter `vendor/` ab (`gnunet-*.tar.gz`, `exchange-*.tar.gz`, `merchant-*.tar.gz`, `libeufin-*.tar.gz`); bei unvollständigem Tarball fällt der Build auf Git zurück. -- Release-Tarballs laden: `./scripts/fetch-tarballs.sh` (GNUnet von `https://ftp.fau.de/gnunet/`, Taler-Komponenten von `https://ftp.fau.de/gnu/taler/`; per `*_VERSION` oder `*_TARBALL_URL` überschreibbar). +- Release-Tarballs laden: `./scripts/fetch-tarballs.sh` (GNUnet von `https://ftp.gnu.org/gnu/gnunet/`, Taler-Komponenten von `https://ftp.fau.de/gnu/taler/`; liest `.env`, deshalb greifen `*_VERSION` oder `*_TARBALL_URL`). ## Nützliche Kommandos - Logs: `docker compose logs -f exchange` (oder bank/merchant/caddy/wordpress). diff --git a/README.md b/README.md index 60a1e9b..5c37bd0 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ Container stack for GNU Taler (Exchange, Merchant, LibEuFin Bank) with optional - After changing DB passwords in `.env`, no manual SQL rendering is needed—the init script reads them at container start. - Release refs/tarballs: Browse tags/commits at `https://git.taler.net/{gnunet,exchange,merchant,libeufin}.git/` (Tarballs via `.../snapshot/.tar.gz`) and set `*_REF`/`GNUNET_TARBALL_URL` accordingly. - Offline tarball drop-in: place tarballs under `vendor/` (`gnunet-*.tar.gz`, `exchange-*.tar.gz`, `merchant-*.tar.gz`, `libeufin-*.tar.gz`); the build picks the first match and falls back to git if incomplete. -- Fetch release tarballs: `./scripts/fetch-tarballs.sh` (GNUnet from `https://ftp.fau.de/gnunet/`, Taler components from `https://ftp.fau.de/gnu/taler/`; override with `*_VERSION` or `*_TARBALL_URL`). +- Fetch release tarballs: `./scripts/fetch-tarballs.sh` (GNUnet from `https://ftp.gnu.org/gnu/gnunet/`, Taler components from `https://ftp.fau.de/gnu/taler/`; reads `.env` so `*_VERSION`/`*_TARBALL_URL` overrides work). ## Useful commands - Logs: `docker compose logs -f exchange` (or bank/merchant/caddy/wordpress). diff --git a/scripts/fetch-tarballs.sh b/scripts/fetch-tarballs.sh index 760160d..3775637 100755 --- a/scripts/fetch-tarballs.sh +++ b/scripts/fetch-tarballs.sh @@ -10,6 +10,14 @@ ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" VENDOR_DIR="${ROOT_DIR}/vendor" mkdir -p "${VENDOR_DIR}" +# Load .env if present to honor GNUNET_TARBALL_URL/EXCHANGE_TARBALL_URL/... overrides +if [[ -f "${ROOT_DIR}/.env" ]]; then + set -a + # shellcheck disable=SC1091 + source "${ROOT_DIR}/.env" + set +a +fi + GNUNET_VERSION="${GNUNET_VERSION:-0.26.1}" EXCHANGE_VERSION="${EXCHANGE_VERSION:-1.2.2}" MERCHANT_VERSION="${MERCHANT_VERSION:-1.1.6}"