sandcastle-ng

commit dcc0bfbea533b81a82cb476462876ca61cd9f7f6
parent 857ac1337aded1807a82536fa4878d33b47b64a7
Author: Florian Dold <florian@dold.me>
Date:   Mon, 17 Nov 2025 15:58:58 +0100

use standalone SPA by default

Diffstat:
M
Dockerfile
 | 
5
+++++
M
buildconfig/exchange.tag
 | 
2
+-
M
buildconfig/merchant.tag
 | 
2
+-
M
buildconfig/wallet.tag
 | 
3
+--
M
overrides/taler.localhost
 | 
4
++++
M
overrides/test.taler.net
 | 
2
++
M
scripts/demo/setup-sandcastle.sh
 | 
9
+++++++++

7 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/Dockerfile b/Dockerfile
@@ -260,6 +260,10 @@ RUN TAG=$(cat /buildconfig/wallet.tag) && \
 RUN npm install -g pnpm@^9.10.0
 WORKDIR /build/taler-typescript-core
 RUN ./bootstrap
+# Install standalone merchant SPA
+WORKDIR /build/taler-typescript-core/packages/merchant-backoffice-ui
+RUN ./configure --prefix=/usr/local
+RUN make install
 # taler-wallet-cli
 WORKDIR /build/taler-typescript-core/packages/taler-wallet-cli
 RUN ./configure --prefix=/usr/local
@@ -325,6 +329,7 @@ COPY --from=taler-mailbox /packages/taler-mailbox/* /packages/
 COPY --from=exchange /packages/exchange/* /packages/
 COPY --from=merchant /packages/merchant/* /packages/
 COPY --from=wallet /packages/wallet/* /packages/
+COPY --from=wallet /usr/local/share/taler-merchant-backoffice /usr/local/share/taler-merchant-backoffice
 COPY --from=libeufin /packages/libeufin/* /packages/
 COPY --from=merchant-demos /packages/merchant-demos/* /packages/
 COPY --from=challenger /packages/challenger/* /packages/
diff --git a/buildconfig/exchange.tag b/buildconfig/exchange.tag
@@ -1 +1 @@
-v1.2.0-dev.1
+v1.2.0-dev.2
diff --git a/buildconfig/merchant.tag b/buildconfig/merchant.tag
@@ -1 +1 @@
-v1.2.0-dev.1
+v1.2.0-dev.2
diff --git a/buildconfig/wallet.tag b/buildconfig/wallet.tag
@@ -1 +1 @@
-v1.1.0
-\ No newline at end of file
+v1.2.0-dev.3
diff --git a/overrides/taler.localhost b/overrides/taler.localhost
@@ -5,3 +5,7 @@ NAME=Kudos
 EXTERNAL_PORT=4321
 
 MY_HELPER_EMAIL=/data/sandcastle-merchant-email-insecure-test
+
+# Use latest SPA from taler-typescript-core.git
+STANDALONE_MERCHANT_SPA=1
+
diff --git a/overrides/test.taler.net b/overrides/test.taler.net
@@ -3,3 +3,5 @@ ALT_UNIT_NAME=テ
 MYDOMAIN=test.taler.net
 FRACTIONALS=0
 NAME=Testkudos
+# Use latest SPA from taler-typescript-core.git
+STANDALONE_MERCHANT_SPA=1
diff --git a/scripts/demo/setup-sandcastle.sh b/scripts/demo/setup-sandcastle.sh
@@ -353,6 +353,12 @@ rm -f /usr/share/taler-merchant/config.d/kudos.conf
 
 MY_HELPER_EMAIL=${OVERRIDE_MERCHANT_HELPER_EMAIL:-/data/sandcastle-merchant-email-helper}
 
+# By default, use standalone SPA
+MERCHANT_SPA_SETTING=
+if [[ ${STANDALONE_MERCHANT_SPA:-1} == 1 ]]; then
+  MERCHANT_SPA_SETTING="SPA_DIR = /usr/local/share/taler-merchant-backoffice/"
+fi
+
 # We need to define the default currency for the UI.
 cat <<EOF >/etc/taler-merchant/conf.d/sandcastle-merchant.conf
 [merchant]
@@ -363,6 +369,9 @@ ENABLE_SELF_PROVISIONING = YES
 MANDATORY_TAN_CHANNELS = email
 
 HELPER_EMAIL = $MY_HELPER_EMAIL
+
+$MERCHANT_SPA_SETTING
+
 EOF
 
 cat <<EOF >/etc/taler-merchant/conf.d/sandcastle-merchant-exchanges.conf