From 10d53df31c4a859e47d4cbc1982dfe71e51ab9d2 Mon Sep 17 00:00:00 2001
From: esurface <esurface@rti.org>
Date: Tue, 12 Dec 2023 12:58:13 -0500
Subject: [PATCH 1/2] Use T_MYSQL_CONTAINER_NAME config var in mysql setup
 script

---
 mysql-setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mysql-setup.sh b/mysql-setup.sh
index d4d2a763ff..e89a150d76 100755
--- a/mysql-setup.sh
+++ b/mysql-setup.sh
@@ -7,14 +7,14 @@ else
   echo "You have no config.sh. Copy config.defaults.sh to config.sh, change the passwords and try again." && exit 1;
 fi
 
-USER_EXISTS=$(docker exec mysql mysql -u root -p"$T_MYSQL_PASSWORD" -sse "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = '$T_MYSQL_USER')")
+USER_EXISTS=$(docker exec $T_MYSQL_CONTAINER_NAME mysql -u root -p"$T_MYSQL_PASSWORD" -sse "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = '$T_MYSQL_USER')")
 
 if [ "$USER_EXISTS" = 1 ]; then
   echo "MySQL user is already set up."
 else
   echo "Setting up mysql user..."
-  CMD="docker exec mysql mysql -u root -p'$T_MYSQL_PASSWORD' -e \"CREATE USER '$T_MYSQL_USER'@'%' IDENTIFIED WITH mysql_native_password BY '$T_MYSQL_PASSWORD';\""
+  CMD="docker exec $T_MYSQL_CONTAINER_NAME mysql -u root -p'$T_MYSQL_PASSWORD' -e \"CREATE USER '$T_MYSQL_USER'@'%' IDENTIFIED WITH mysql_native_password BY '$T_MYSQL_PASSWORD';\""
   eval ${CMD}
-  CMD="docker exec mysql mysql -u root -p'$T_MYSQL_PASSWORD' -e \"GRANT ALL PRIVILEGES ON \"*.*\" TO '$T_MYSQL_USER'@'%' WITH GRANT OPTION;\""
+  CMD="docker exec $T_MYSQL_CONTAINER_NAME mysql -u root -p'$T_MYSQL_PASSWORD' -e \"GRANT ALL PRIVILEGES ON \"*.*\" TO '$T_MYSQL_USER'@'%' WITH GRANT OPTION;\""
   eval ${CMD}
 fi

From ad8d365857bf81c332ea0569594980c13d17c16a Mon Sep 17 00:00:00 2001
From: esurface <esurface@rti.org>
Date: Tue, 12 Dec 2023 17:22:36 -0500
Subject: [PATCH 2/2] Fix CHANGELOG

---
 CHANGELOG.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b12505e402..b03d00f63a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,8 +48,6 @@ git checkout -b v3.30.1 v3.30.1
 docker rmi tangerine/tangerine:<previous_version>
 ```
 
-# What's new
-
 ## v3.30.0
 
 __New Features__