From b0ac371a43145d4e30bdc302b88384e1252c80fa Mon Sep 17 00:00:00 2001
From: Kayne Ruse <kayneruse@gmail.com>
Date: Thu, 4 Mar 2021 06:15:46 +1100
Subject: [PATCH] Tweaking deployment startup, read more

MariaDB's root password needs to be hidden from the game server's container,
so I've changed the startup logic. MariaDB supposedly runs certain files that
are found in a specific directory, so I'm using volumes to place startup.sql
there.

This needs testing on a mock deployment server.

Related to #1
---
 configure-script.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/configure-script.js b/configure-script.js
index 179119e..8404d26 100644
--- a/configure-script.js
+++ b/configure-script.js
@@ -59,7 +59,7 @@ const question = (prompt, def) => {
 
 	//TODO: Implement chat-server as a docker container
 
-const yml = `
+const ymlfile = `
 version: "3.6"
 services:
   ${projectName}:
@@ -135,7 +135,8 @@ services:
     environment:
       MYSQL_ROOT_PASSWORD: ${databaseRootPassword}
     volumes:
-      - ./mysql:/var/lib/mysql
+      - "./mysql:/var/lib/mysql"
+	  - "./startup.sql:/docker-entrypoint-initdb.d/startup.sql:ro"
     networks:
       - app-network
 
@@ -171,16 +172,13 @@ FROM node:15
 WORKDIR "/app"
 COPY package*.json ./
 RUN npm install
-RUN apt-get update
-RUN apt-get install -y mariadb-client
 COPY . /app
 EXPOSE 3000
-
 ENTRYPOINT ["bash", "-c"]
-CMD ["mysql --host=database --user=root --password=${databaseRootPassword} < ./startup.sql && npm start"]
+CMD ["npm start"]
 `;
 
-	const scriptfile = `
+	const sqlfile = `
 CREATE DATABASE IF NOT EXISTS ${projectName};
 CREATE USER IF NOT EXISTS '${projectDBUser}'@'%' IDENTIFIED BY '${projectDBPass}';
 GRANT ALL PRIVILEGES ON ${projectName}.* TO '${projectDBUser}'@'%';
@@ -196,9 +194,9 @@ GRANT ALL PRIVILEGES ON ${chatName}.* TO '${chatDBUser}'@'%';
 FLUSH PRIVILEGES;
 `;
 
-	fs.writeFileSync('docker-compose.yml', yml);
+	fs.writeFileSync('docker-compose.yml', ymlfile);
 	fs.writeFileSync('Dockerfile', dockerfile);
-	fs.writeFileSync('startup.sql', scriptfile);
+	fs.writeFileSync('startup.sql', sqlfile);
 })()
 	.then(() => rl.close())
 	.catch(e => console.error(e))