From 9387e88dc094f0ff2e7ef54bddddd296b08b5c7d Mon Sep 17 00:00:00 2001
From: Nils Bergmann <nilsbergmann@noim.io>
Date: Tue, 7 Dec 2021 20:58:18 +0100
Subject: [PATCH] WIP: still no working MasterServer binary

---
 .env.example           |  6 ++++++
 docker/Dockerfile      | 18 ++++++++++--------
 docker/start_server.sh | 17 +++++++++++++----
 3 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 .env.example

diff --git a/.env.example b/.env.example
new file mode 100644
index 00000000..4abf6a3c
--- /dev/null
+++ b/.env.example
@@ -0,0 +1,6 @@
+# Full path to the LEGO Universe client
+CLIENT_PATH=/Users/someuser/LEGO Universe
+# Can improve build time
+BUILD_THREADS=10
+# Updates NET_VERSION in CMakeVariables.txt
+BUILD_VERSION=171023
\ No newline at end of file
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8ee22b11..9d1d4a36 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,12 +5,13 @@ WORKDIR /build
 RUN --mount=type=cache,target=/var/cache/apt \
     echo "Install build dependencies" && \
     apt update && \
-    apt install gcc cmake zlib1g-dev make build-essential g++ unzip ca-certificates wget -yqq --no-install-recommends && \
+    apt remove -y libmysqlcppconn7v5 libmysqlcppconn-dev && \
+    apt install cmake zlib1g-dev make gcc g++ build-essential unzip ca-certificates wget -yqq --no-install-recommends && \
     rm -rf /var/lib/apt/lists/* && \
     update-ca-certificates && \
-    wget https://dev.mysql.com/get/Downloads/Connector-C++/libmysqlcppconn9_8.0.27-1debian11_amd64.deb -O /tmp/libmysqlcppconn.deb && \
-    dpkg -i /tmp/libmysqlcppconn.deb && \
-    rm /tmp/libmysqlcppconn.deb
+    wget https://dev.mysql.com/get/Downloads/Connector-C++/libmysqlcppconn9_8.0.27-1debian11_amd64.deb -O /tmp/libmysqlcppconn9_8.0.27-1debian11_amd64.deb && \
+    dpkg -i /tmp/libmysqlcppconn9_8.0.27-1debian11_amd64.deb && \
+    rm -rf /tmp/libmysqlcppconn9_8.0.27-1debian11_amd64.deb
 
 COPY dAuthServer/ /build/dAuthServer
 COPY dChatServer/ /build/dChatServer
@@ -36,7 +37,7 @@ ARG BUILD_VERSION=171022
 RUN echo "Build server" && \
     mkdir -p build && \
     cd build && \
-    sed -i -e "s/171023/${BUILD_VERSION}/g" ../CMakeVariables.txt && \ 
+    sed -i -e "s/171022/${BUILD_VERSION}/g" ../CMakeVariables.txt && \ 
     cmake .. && \
     make -j $BUILD_THREADS
 
@@ -54,11 +55,12 @@ COPY --from=build /build/migrations /app/migrations
 RUN --mount=type=cache,target=/var/cache/apt \ 
     apt update && \
     apt install mariadb-client python3 sqlite3 ca-certificates wget -yqq --no-install-recommends && \
+    apt remove -y libmysqlcppconn7v5 libmysqlcppconn-dev && \
     rm -rf /var/lib/apt/lists/* && \
     update-ca-certificates && \
-    wget https://dev.mysql.com/get/Downloads/Connector-C++/libmysqlcppconn9_8.0.27-1debian11_amd64.deb -O /tmp/libmysqlcppconn.deb && \
-    dpkg -i /tmp/libmysqlcppconn.deb && \
-    rm /tmp/libmysqlcppconn.deb
+    wget https://dev.mysql.com/get/Downloads/Connector-C++/libmysqlcppconn9_8.0.27-1debian11_amd64.deb -O /tmp/libmysqlcppconn9_8.0.27-1debian11_amd64.deb && \
+    dpkg -i /tmp/libmysqlcppconn9_8.0.27-1debian11_amd64.deb && \
+    rm -rf /tmp/libmysqlcppconn9_8.0.27-1debian11_amd64.deb
 
 ADD docker/*.py /app/utils/
 
diff --git a/docker/start_server.sh b/docker/start_server.sh
index 093819c5..87c3e289 100644
--- a/docker/start_server.sh
+++ b/docker/start_server.sh
@@ -39,13 +39,22 @@ function update_ini() {
     sed -i "/^$KEY=/s/=.*/=$NEW_VALUE/" $INI_FILE
 }
 
+function update_database_ini_values_for() {
+    INI_FILE=$1
+    update_ini $INI_FILE mysql_host $DATABASE_HOST
+    update_ini $INI_FILE mysql_database $DATABASE
+    update_ini $INI_FILE mysql_username $DATABASE_USER
+    update_ini $INI_FILE mysql_password $USE_DATABASE_PASSWORD
+}
+
 function update_ini_values() {
-    update_ini worldconfig.ini mysql_host $DATABASE_HOST
-    update_ini worldconfig.ini mysql_database $DATABASE
-    update_ini worldconfig.ini mysql_username $DATABASE_USER
-    update_ini worldconfig.ini mysql_password $USE_DATABASE_PASSWORD
     update_ini worldconfig.ini chat_server_port $CHAT_SERVER_PORT
     update_ini worldconfig.ini max_clients $MAX_CLIENTS
+
+    update_database_ini_values_for masterconfig.ini
+    update_database_ini_values_for authconfig.ini
+    update_database_ini_values_for chatconfig.ini
+    update_database_ini_values_for worldconfig.ini
 }
 
 function symlink_client_files() {