From e1362911fdb1fd842c45f47d6d337e8a5504028b Mon Sep 17 00:00:00 2001
From: nocci <dev@sky-net.it>
Date: Fri, 12 Dec 2025 11:39:56 +0000
Subject: [PATCH] Run bootstrap for exchange/merchant if configure missing;
 init git for tarballs

---
 Dockerfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6d4ab6d..1c90e9e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -88,10 +88,13 @@ RUN set -e; \
       git clone --depth 1 --branch "${EXCHANGE_REF}" https://git.taler.net/exchange.git /src/exchange; \
       EXCHANGE_DIR="/src/exchange"; \
     fi; \
-    if [ "${EXCHANGE_TAR}" = "0" ]; then \
-      cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \
+    if [ ! -f "${EXCHANGE_DIR}/configure" ]; then \
+      if [ ! -d "${EXCHANGE_DIR}/.git" ]; then \
+        (cd "${EXCHANGE_DIR}" && git init >/dev/null 2>&1); \
+      fi; \
+      cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./bootstrap; \
     else \
-      echo "Skipping bootstrap for Exchange tarball"; \
+      echo "Skipping bootstrap for Exchange (configure present)"; \
     fi; \
     cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./configure --prefix=/usr && make -j$(nproc) && make install; \
     # Merchant
@@ -115,10 +118,13 @@ RUN set -e; \
       git clone --depth 1 --branch "${MERCHANT_REF}" https://git.taler.net/merchant.git /src/merchant; \
       MERCHANT_DIR="/src/merchant"; \
     fi; \
-    if [ "${MERCHANT_TAR}" = "0" ]; then \
-      cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \
+    if [ ! -f "${MERCHANT_DIR}/configure" ]; then \
+      if [ ! -d "${MERCHANT_DIR}/.git" ]; then \
+        (cd "${MERCHANT_DIR}" && git init >/dev/null 2>&1); \
+      fi; \
+      cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./bootstrap; \
     else \
-      echo "Skipping bootstrap for Merchant tarball"; \
+      echo "Skipping bootstrap for Merchant (configure present)"; \
     fi; \
     cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./configure --prefix=/usr && make -j$(nproc) && make install