From 47ad30108736e24ff3ac351a399c7ed8119e0c59 Mon Sep 17 00:00:00 2001 From: nocci Date: Thu, 11 Dec 2025 16:10:06 +0000 Subject: [PATCH] Clarify build args usage; restore env example --- README-DE.md | 11 ++++++++++- README.md | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/README-DE.md b/README-DE.md index 1b2432c..b951bdc 100644 --- a/README-DE.md +++ b/README-DE.md @@ -20,7 +20,16 @@ Container-Stack für GNU Taler (Exchange, Merchant, LibEuFin Bank) mit optionale - `MASTER_PUBLIC_KEY`: zum Master-Privatschlüssel passend. - `LIBEUFIN_MERCHANT_TOKEN`: erst nach Token-Generierung eintragen (siehe unten). - Versionen: `GNUNET_REF` (Default v0.26.1), `EXCHANGE_REF`, `MERCHANT_REF`, `LIBEUFIN_REF`, optional `GNUNET_TARBALL_URL` für Tarball-Builds. -3. Build: `./scripts/build-image.sh` (liest `.env` für Refs/URLs; bei Bedarf per Env überschreiben) +3. Build: `./scripts/build-image.sh` (liest `.env` für Refs/URLs). Alternativ mit expliziten Build-Args, da `docker build ...` die `.env` NICHT automatisch lädt: + ``` + docker build \ + --build-arg GNUNET_TARBALL_URL="$GNUNET_TARBALL_URL" \ + --build-arg GNUNET_REF="$GNUNET_REF" \ + --build-arg EXCHANGE_REF="$EXCHANGE_REF" \ + --build-arg MERCHANT_REF="$MERCHANT_REF" \ + --build-arg LIBEUFIN_REF="$LIBEUFIN_REF" \ + -t taler-stack:build . + ``` 4. Start: `docker compose up -d` 5. Bank-Token erzeugen: `./scripts/provision-bank-user.sh` (Bank-Service muss laufen). Token steht danach in `TOKEN_OUTPUT` (Default `bank/token-info.txt`); Wert in `.env` bei `LIBEUFIN_MERCHANT_TOKEN` eintragen. 6. Optional: Exchange-Payto automatisch freischalten, indem du in `.env` `ENABLE_EXCHANGE_ACCOUNT=1` setzt (PAYTO/Hosts anpassen); Job läuft als `exchange-account-init`. diff --git a/README.md b/README.md index 184acf4..de98ad8 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,16 @@ Container stack for GNU Taler (Exchange, Merchant, LibEuFin Bank) with optional - `MASTER_PUBLIC_KEY`: must match the master private key. - `LIBEUFIN_MERCHANT_TOKEN`: set after token generation (see below). - Versions: `GNUNET_REF` (default v0.26.1), `EXCHANGE_REF`, `MERCHANT_REF`, `LIBEUFIN_REF`, optional `GNUNET_TARBALL_URL` for tarball builds. -3. Build: `./scripts/build-image.sh` (reads `.env` for refs/URLs; override with env vars if needed) +3. Build: `./scripts/build-image.sh` (liest `.env` für Build-Refs/URLs). Alternativ mit expliziten Build-Args, da `docker build ...` die `.env` NICHT automatisch lädt: + ``` + docker build \ + --build-arg GNUNET_TARBALL_URL="$GNUNET_TARBALL_URL" \ + --build-arg GNUNET_REF="$GNUNET_REF" \ + --build-arg EXCHANGE_REF="$EXCHANGE_REF" \ + --build-arg MERCHANT_REF="$MERCHANT_REF" \ + --build-arg LIBEUFIN_REF="$LIBEUFIN_REF" \ + -t taler-stack:build . + ``` 4. Start: `docker compose up -d` 5. Generate bank token: `./scripts/provision-bank-user.sh` (bank service must be running). The token is written to `TOKEN_OUTPUT` (default `bank/token-info.txt`); copy the secret token into `.env` as `LIBEUFIN_MERCHANT_TOKEN`. 6. Optional: auto-enable exchange payto by setting `ENABLE_EXCHANGE_ACCOUNT=1` in `.env` (adjust PAYTO/hosts); job runs as `exchange-account-init`.