From 8fda76db5cb9e44c2b30f05338020414d88d39fe Mon Sep 17 00:00:00 2001
From: RisingPhil <philippe.symons@gmail.com>
Date: Tue, 16 Dec 2025 10:15:05 +0100
Subject: [PATCH] Do the same fix for payload-generator on MinGW64 as we did
 for PCCS

---
 Makefile           | 12 +++++++++++-
 docker-compose.yml | 21 ++++++++++++++-------
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 124905c..b7ddae6 100644
--- a/Makefile
+++ b/Makefile
@@ -151,7 +151,17 @@ all: $(BUILD)
 generate_data:
 	mkdir -p data
 	mkdir -p to_compress
-	@env -i "PATH=$(PATH)" $(MAKE) -C tools/payload-generator
+	@env - \
+		PATH="$(PATH)" \
+		TMPDIR=/tmp TMP=/tmp TEMP=/tmp \
+		SYSTEMROOT="$(SYSTEMROOT)" \
+		CC=cc \
+		CXX=c++ \
+		CFLAGS= \
+		CXXFLAGS= \
+		LDFLAGS= \
+		AR=ar \
+		$(MAKE) -C tools/payload-generator
 	@echo
 	@echo "----------------------------------------------------------------"
 	@echo
diff --git a/docker-compose.yml b/docker-compose.yml
index 8bba183..92083ae 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,12 +16,19 @@ services:
   build:
     image: ptgb-builder:latest
     working_dir: /usr/Poke_Transporter_GB
-    command: tail -F anything
+    command: tail -f /dev/null
+    environment:
+      # Set SSH_AUTH_SOCK inside container only if forwarding is possible
+      - SSH_AUTH_SOCK=/ssh-agent
     volumes:
-      - type: bind
-        source: ${SSH_AUTH_SOCK}
-        target: ${SSH_AUTH_SOCK}
-      - type: bind
-        source: ${PWD}
-        target: /usr/Poke_Transporter_GB
+      # Mount the project directory (portable)
+      - ${COMPOSE_PROJECT_DIR}:/usr/Poke_Transporter_GB
+
+      # Mount SSH agent only if available (Linux/WSL2)
+      - type: bind
+        source: ${SSH_AUTH_SOCK:-}
+        target: /ssh-agent
+        read_only: true
+        # Only mount if SSH_AUTH_SOCK is set
+        consistency: cached