From a94b7d6b2bc78d2f516f5e19e7db04e5bb9ef545 Mon Sep 17 00:00:00 2001 From: Rene Cannao Date: Tue, 3 Feb 2026 22:19:07 +0000 Subject: [PATCH] Add PROXYSQLGENAI support to docker builds - Add PROXYSQLGENAI to docker-compose.yml environment variables - Modify deb-compliant, rhel-compliant, and suse-compliant entrypoints to pass PROXYSQLGENAI=1 to make commands when set This allows building packages with GenAI support using: PROXYSQLGENAI=1 make ubuntu24 PROXYSQLGENAI=1 make debian12-dbg etc. --- docker-compose.yml | 1 + .../proxysql/deb-compliant/entrypoint/entrypoint.bash | 6 +++++- .../proxysql/rhel-compliant/entrypoint/entrypoint.bash | 6 +++++- .../proxysql/suse-compliant/entrypoint/entrypoint.bash | 6 +++++- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 30b4017e4..c459bfdb1 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,6 +16,7 @@ services: - NOJEMALLOC - WITHASAN - BLD_NAME + - PROXYSQLGENAI command: bash -l -c /opt/entrypoint/entrypoint.bash #################################################################################################### diff --git a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash index 8184c1fc9..d35e3c9c7 100755 --- a/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash +++ b/docker/images/proxysql/deb-compliant/entrypoint/entrypoint.bash @@ -44,7 +44,11 @@ fi # clean is expensive, do it before, outside of container #${MAKE} cleanbuild ${MAKE} ${MAKEOPT} ${deps_target} -${MAKE} ${MAKEOPT} ${build_target} +if [[ "${PROXYSQLGENAI:-}" == "1" ]]; then + ${MAKE} ${MAKEOPT} PROXYSQLGENAI=1 ${build_target} +else + ${MAKE} ${MAKEOPT} ${build_target} +fi touch /opt/proxysql/src/proxysql diff --git a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash index cb01d915b..08505cc82 100755 --- a/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash +++ b/docker/images/proxysql/rhel-compliant/entrypoint/entrypoint.bash @@ -44,7 +44,11 @@ fi # clean is expensive, do it before, outside of container #${MAKE} cleanbuild ${MAKE} ${MAKEOPT} ${deps_target} -${MAKE} ${MAKEOPT} ${build_target} +if [[ "${PROXYSQLGENAI:-}" == "1" ]]; then + ${MAKE} ${MAKEOPT} PROXYSQLGENAI=1 ${build_target} +else + ${MAKE} ${MAKEOPT} ${build_target} +fi touch /opt/proxysql/src/proxysql diff --git a/docker/images/proxysql/suse-compliant/entrypoint/entrypoint.bash b/docker/images/proxysql/suse-compliant/entrypoint/entrypoint.bash index d4162ce16..6381e6eef 100755 --- a/docker/images/proxysql/suse-compliant/entrypoint/entrypoint.bash +++ b/docker/images/proxysql/suse-compliant/entrypoint/entrypoint.bash @@ -44,7 +44,11 @@ fi # clean is expensive, do it before, outside of container #${MAKE} cleanbuild ${MAKE} ${MAKEOPT} ${deps_target} -${MAKE} ${MAKEOPT} ${build_target} +if [[ "${PROXYSQLGENAI:-}" == "1" ]]; then + ${MAKE} ${MAKEOPT} PROXYSQLGENAI=1 ${build_target} +else + ${MAKE} ${MAKEOPT} ${build_target} +fi touch /opt/proxysql/src/proxysql