From d65c0944f46a2d5a57dcadadb348ce521c693931 Mon Sep 17 00:00:00 2001
From: Rene Cannao <rene@proxysql.com>
Date: Tue, 10 Mar 2026 01:21:47 +0000
Subject: [PATCH 1/4] Change build network_mode to host to allow internet
 access for packaging

---
 docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 51031b9b6..87c44f26e 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,7 +4,7 @@ services:
 ####################################################################################################
   _build:
     image: none
-    network_mode: bridge
+    network_mode: host
     privileged: true
     environment:
       - MAKE

From 55d86feefb94083ae987f04d94afe380533d25db Mon Sep 17 00:00:00 2001
From: Rene Cannao <rene@proxysql.com>
Date: Tue, 10 Mar 2026 01:28:55 +0000
Subject: [PATCH 2/4] Pass PROXYSQL31, PROXYSQLFFTO and PROXYSQLTSDB into the
 build container

---
 docker-compose.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index 87c44f26e..6b6f7d041 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,6 +17,9 @@ services:
       - WITHASAN
       - BLD_NAME
       - PROXYSQLGENAI
+      - PROXYSQL31
+      - PROXYSQLFFTO
+      - PROXYSQLTSDB
       - GIT_VERSION
     command: bash -l -c /opt/entrypoint/entrypoint.bash
 

From c5ccb0fb1971774c3dbdf0b82d49614d7ac85f01 Mon Sep 17 00:00:00 2001
From: Rene Cannao <rene@proxysql.com>
Date: Tue, 10 Mar 2026 01:40:30 +0000
Subject: [PATCH 3/4] Fix GIT_VERSION logic to correctly respect exported tier
 variables

---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 317c206dc..374dbbd08 100644
--- a/Makefile
+++ b/Makefile
@@ -9,9 +9,9 @@
 ### export GIT_VERSION=3.x.y-dev
 ### ```
 
-GIT_VERSION ?= $(shell git describe --long --abbrev=7 2>/dev/null || git describe --long --abbrev=7 --always)
-ifndef GIT_VERSION
-    $(error GIT_VERSION is not set)
+GIT_VERSION_BASE := $(shell git describe --long --abbrev=7 2>/dev/null || git describe --long --abbrev=7 --always)
+ifndef GIT_VERSION_BASE
+    $(error GIT_VERSION_BASE is not set)
 endif
 
 ### RELEASE TIERS & FEATURE FLAGS:
@@ -54,9 +54,10 @@ ifeq ($(PROXYSQL31),1)
 endif
 
 # Only increment version at the top-level make to avoid double-incrementing in recursive makes
+GIT_VERSION := $(GIT_VERSION_BASE)
 ifeq ($(MAKELEVEL),0)
 # Normalize GIT_VERSION by stripping leading 'v' for arithmetic
-GIT_VERSION_NORM := $(shell echo "$(GIT_VERSION)" | sed 's/^v//')
+GIT_VERSION_NORM := $(shell echo "$(GIT_VERSION_BASE)" | sed 's/^v//')
 # If PROXYSQLGENAI is enabled, increment the major version number by 1
 ifeq ($(PROXYSQLGENAI),1)
 	GIT_VERSION := $(shell echo "$(GIT_VERSION_NORM)" | awk -F. '{printf "%d.%s", $$1+1, substr($$0, length($$1)+2)}')

From bd9e99d6988f969abcf5e125f87daa28ab36a6c8 Mon Sep 17 00:00:00 2001
From: Rene Cannao <rene@proxysql.com>
Date: Tue, 10 Mar 2026 01:56:01 +0000
Subject: [PATCH 4/4] Fix GIT_VERSION assignment to preserve version string in
 recursive make calls

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 374dbbd08..bea56fa49 100644
--- a/Makefile
+++ b/Makefile
@@ -54,7 +54,7 @@ ifeq ($(PROXYSQL31),1)
 endif
 
 # Only increment version at the top-level make to avoid double-incrementing in recursive makes
-GIT_VERSION := $(GIT_VERSION_BASE)
+GIT_VERSION ?= $(GIT_VERSION_BASE)
 ifeq ($(MAKELEVEL),0)
 # Normalize GIT_VERSION by stripping leading 'v' for arithmetic
 GIT_VERSION_NORM := $(shell echo "$(GIT_VERSION_BASE)" | sed 's/^v//')