From 831a473fbe6cec6b9799cb2fb225c15af29a1709 Mon Sep 17 00:00:00 2001
From: nocci <dev@sky-net.it>
Date: Fri, 12 Dec 2025 11:38:08 +0000
Subject: [PATCH] Skip bootstrap for exchange/merchant tarballs to avoid git
 checks

---
 Dockerfile | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 35869d1..6d4ab6d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -68,6 +68,7 @@ RUN set -e; \
 RUN set -e; \
     # Exchange
     EXCHANGE_DIR=""; \
+    EXCHANGE_TAR=0; \
     if ls /vendor/exchange*.tar.gz >/dev/null 2>&1; then \
       LOCAL_TARBALL="$(ls /vendor/exchange*.tar.gz | head -1)"; \
       echo "Using local Exchange tarball from ${LOCAL_TARBALL}"; \
@@ -75,23 +76,26 @@ RUN set -e; \
       cp "${LOCAL_TARBALL}" exchange.tar.gz; \
       tar xzf exchange.tar.gz; \
       EXCHANGE_DIR="$(ls -d exchange-* | head -1)"; \
+      EXCHANGE_TAR=1; \
     elif [ -n "${EXCHANGE_TARBALL_URL}" ]; then \
       echo "Fetching Exchange tarball ${EXCHANGE_TARBALL_URL}"; \
       mkdir -p /src && cd /src; \
       curl -L "${EXCHANGE_TARBALL_URL}" -o exchange.tar.gz; \
       tar xzf exchange.tar.gz; \
       EXCHANGE_DIR="$(ls -d exchange-* | head -1)"; \
+      EXCHANGE_TAR=1; \
     else \
       git clone --depth 1 --branch "${EXCHANGE_REF}" https://git.taler.net/exchange.git /src/exchange; \
       EXCHANGE_DIR="/src/exchange"; \
     fi; \
-    if [ ! -d "${EXCHANGE_DIR}/.git" ]; then \
-      (cd "${EXCHANGE_DIR}" && git init >/dev/null 2>&1); \
+    if [ "${EXCHANGE_TAR}" = "0" ]; then \
+      cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \
+    else \
+      echo "Skipping bootstrap for Exchange tarball"; \
     fi; \
-    cd "${EXCHANGE_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./bootstrap && \
-    ./configure --prefix=/usr && make -j$(nproc) && make install; \
+    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
-    MERCHANT_DIR=""; \
+    MERCHANT_DIR=""; MERCHANT_TAR=0; \
     if ls /vendor/merchant*.tar.gz >/dev/null 2>&1; then \
       LOCAL_TARBALL="$(ls /vendor/merchant*.tar.gz | head -1)"; \
       echo "Using local Merchant tarball from ${LOCAL_TARBALL}"; \
@@ -99,21 +103,24 @@ RUN set -e; \
       cp "${LOCAL_TARBALL}" merchant.tar.gz; \
       tar xzf merchant.tar.gz; \
       MERCHANT_DIR="$(ls -d merchant-* | head -1)"; \
+      MERCHANT_TAR=1; \
     elif [ -n "${MERCHANT_TARBALL_URL}" ]; then \
       echo "Fetching Merchant tarball ${MERCHANT_TARBALL_URL}"; \
       mkdir -p /src && cd /src; \
       curl -L "${MERCHANT_TARBALL_URL}" -o merchant.tar.gz; \
       tar xzf merchant.tar.gz; \
       MERCHANT_DIR="$(ls -d merchant-* | head -1)"; \
+      MERCHANT_TAR=1; \
     else \
       git clone --depth 1 --branch "${MERCHANT_REF}" https://git.taler.net/merchant.git /src/merchant; \
       MERCHANT_DIR="/src/merchant"; \
     fi; \
-    if [ ! -d "${MERCHANT_DIR}/.git" ]; then \
-      (cd "${MERCHANT_DIR}" && git init >/dev/null 2>&1); \
+    if [ "${MERCHANT_TAR}" = "0" ]; then \
+      cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr ./bootstrap; \
+    else \
+      echo "Skipping bootstrap for Merchant tarball"; \
     fi; \
-    cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./bootstrap && \
-    ./configure --prefix=/usr && make -j$(nproc) && make install
+    cd "${MERCHANT_DIR}" && env GNUNET_PREFIX=/usr GIT_CONFIG_NOSYSTEM=1 GIT_DIR= GIT_WORK_TREE=. ./configure --prefix=/usr && make -j$(nproc) && make install
 
 # LibEuFin (Bank)
 RUN set -e; \