From b90cb42e3b8659165ee4f9f5b0bf969c928dc15b Mon Sep 17 00:00:00 2001
From: nocci <dev@sky-net.it>
Date: Fri, 12 Dec 2025 12:47:16 +0000
Subject: [PATCH] Detect taler-exchange/merchant tarball directories when
 unpacked

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

diff --git a/Dockerfile b/Dockerfile
index ff19724..e32a158 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -77,14 +77,14 @@ RUN set -e; \
       mkdir -p /src && cd /src; \
       cp "${LOCAL_TARBALL}" exchange.tar.gz; \
       tar xzf exchange.tar.gz; \
-      EXCHANGE_DIR="$(ls -d exchange-* | head -1)"; \
+      EXCHANGE_DIR="$(ls -d taler-exchange-* exchange-* 2>/dev/null | 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_DIR="$(ls -d taler-exchange-* exchange-* 2>/dev/null | head -1)"; \
       EXCHANGE_TAR=1; \
     else \
       git clone --depth 1 --branch "${EXCHANGE_REF}" https://git.taler.net/exchange.git /src/exchange; \
@@ -122,7 +122,7 @@ RUN set -e; \
       mkdir -p /src && cd /src; \
       cp "${LOCAL_TARBALL}" merchant.tar.gz; \
       tar xzf merchant.tar.gz; \
-      MERCHANT_DIR="$(ls -d merchant-* | head -1)"; \
+      MERCHANT_DIR="$(ls -d taler-merchant-* merchant-* 2>/dev/null | head -1)"; \
       MERCHANT_TAR=1; \
     elif [ -n "${MERCHANT_TARBALL_URL}" ]; then \
       echo "Fetching Merchant tarball ${MERCHANT_TARBALL_URL}"; \