From 4753f689efe1feafb4b9d9a59fac63cb0403faa5 Mon Sep 17 00:00:00 2001
From: nocci <dev@sky-net.it>
Date: Fri, 12 Dec 2025 10:59:05 +0000
Subject: [PATCH] Prefer local vendor gnunet tarball before GNUNET_TARBALL_URL

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

diff --git a/Dockerfile b/Dockerfile
index e34d466..a8bea85 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,18 +23,7 @@ RUN apt-get update && apt-get install -y \
 RUN set -e; \
     mkdir -p /src && cd /src; \
     GNUNET_DIR=""; \
-    if [ -n "${GNUNET_TARBALL_URL}" ]; then \
-      echo "Fetching GNUnet tarball ${GNUNET_TARBALL_URL}"; \
-      curl -L "${GNUNET_TARBALL_URL}" -o gnunet.tar.gz; \
-      tar xzf gnunet.tar.gz; \
-      GNUNET_DIR="$(ls -d gnunet-* | head -1)"; \
-      if [ ! -f "${GNUNET_DIR}/doc/handbook/meson.build" ]; then \
-        echo "Tarball seems incomplete (doc/handbook/meson.build missing); falling back to git clone ${GNUNET_REF}"; \
-        rm -rf "${GNUNET_DIR}"; \
-        git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
-        GNUNET_DIR="gnunet"; \
-      fi; \
-    elif ls /vendor/gnunet*.tar.gz >/dev/null 2>&1; then \
+    if ls /vendor/gnunet*.tar.gz >/dev/null 2>&1; then \
       LOCAL_TARBALL="$(ls /vendor/gnunet*.tar.gz | head -1)"; \
       echo "Using local GNUnet tarball from ${LOCAL_TARBALL}"; \
       cp "${LOCAL_TARBALL}" gnunet.tar.gz; \
@@ -46,6 +35,17 @@ RUN set -e; \
         git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
         GNUNET_DIR="gnunet"; \
       fi; \
+    elif [ -n "${GNUNET_TARBALL_URL}" ]; then \
+      echo "Fetching GNUnet tarball ${GNUNET_TARBALL_URL}"; \
+      curl -L "${GNUNET_TARBALL_URL}" -o gnunet.tar.gz; \
+      tar xzf gnunet.tar.gz; \
+      GNUNET_DIR="$(ls -d gnunet-* | head -1)"; \
+      if [ ! -f "${GNUNET_DIR}/doc/handbook/meson.build" ]; then \
+        echo "Tarball seems incomplete (doc/handbook/meson.build missing); falling back to git clone ${GNUNET_REF}"; \
+        rm -rf "${GNUNET_DIR}"; \
+        git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
+        GNUNET_DIR="gnunet"; \
+      fi; \
     else \
       git clone --depth 1 --branch "${GNUNET_REF}" https://git.taler.net/gnunet.git gnunet; \
       GNUNET_DIR="gnunet"; \