From b03435df274b831eac6020ca1cf0e3ff855f4d67 Mon Sep 17 00:00:00 2001 From: David Caputo Date: Fri, 29 Nov 2024 21:03:07 -0500 Subject: [PATCH] Allow entrypoint to work with helm config --- proxysql/Dockerfile | 2 +- proxysql/dockerdir/entrypoint.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/proxysql/Dockerfile b/proxysql/Dockerfile index e74772418..5430bf2cb 100644 --- a/proxysql/Dockerfile +++ b/proxysql/Dockerfile @@ -98,4 +98,4 @@ VOLUME /var/lib/proxysql ENTRYPOINT ["/entrypoint.sh"] EXPOSE 3306 6032 -CMD ["/usr/bin/proxysql", "-f", "-c", "/etc/proxysql/proxysql.cnf", "--reload"] +CMD ["/usr/bin/proxysql", "-f", "-c", "/etc/proxysql.cnf", "--reload"] diff --git a/proxysql/dockerdir/entrypoint.sh b/proxysql/dockerdir/entrypoint.sh index 215959d53..fa0eb0a2f 100755 --- a/proxysql/dockerdir/entrypoint.sh +++ b/proxysql/dockerdir/entrypoint.sh @@ -2,13 +2,15 @@ set -o xtrace -PROXY_CFG=/etc/proxysql/proxysql.cnf +PROXY_CFG_SRC=/etc/proxysql/proxysql.cnf +PROXY_CFG=/etc/proxysql.cnf PROXY_ADMIN_CFG=/etc/proxysql-admin.cnf MYSQL_INTERFACES='0.0.0.0:3306;0.0.0.0:33062' CLUSTER_PORT='33062' sed "s/#export WRITERS_ARE_READERS=.*$/export WRITERS_ARE_READERS='yes'/g" ${PROXY_ADMIN_CFG} 1<>${PROXY_ADMIN_CFG} +cp ${PROXY_CFG_SRC} ${PROXY_CFG} sed "s/interfaces=\"0.0.0.0:3306\"/interfaces=\"${MYSQL_INTERFACES:-0.0.0.0:3306}\"/g" ${PROXY_CFG} 1<>${PROXY_CFG} sed "s/stacksize=1048576/stacksize=${MYSQL_STACKSIZE:-1048576}/g" ${PROXY_CFG} 1<>${PROXY_CFG} sed "s/threads=2/threads=${MYSQL_THREADS:-2}/g" ${PROXY_CFG} 1<>${PROXY_CFG}