Updated script to wait for database and lanuch server in order.

Renamed services so they're more obvious.
Changed the /code directory to /topaz so it's more obvious what it contains.
Updated documentation to reflect changes
Cleaned up new lines at end of file.
I have tested and am able to successfully launch the server create an account and character then log into the game

Author: NassirAlawar

DOCKER.md

@@ -5,6 +5,7 @@ This guide assumes you have Docker (https://www.docker.com/) installed on your m
 
 ## How to start the server
 
+* Launch docker
 * Pull the repo
 * Open powershell or whatever terminal you're using and navigate to the topaz directory
 * Type `docker-compose up -d` (the `-d` is optional and will free up -detach- the terminal)
@@ -14,18 +15,18 @@ Note the zone IPs are not updated in the DB and will default to 127.0.0.1 so you
 
 ## How to restart the Server/DB
 
-The server runs in the "code" service and the database in the "db" service and will likely be named something like `topaz_code_1` similarly the database will be something like `topaz_db_1`. To see the names assigned to your services type `docker ps`. To restart them you can use the `docker restart` command such as `docker restart topaz_code_1`.
+The server runs in the "game" service and the database in the "db" service and will likely be named something like `topaz_game_1` similarly the database will be something like `topaz_db_1`. To see the names assigned to your services type `docker ps`. To restart them you can use the `docker restart` command such as `docker restart topaz_game_1`.
 
-Alternatively you can stop and start individual services with `docker stop conainer_name` and `docker start container_name` where `container_name` is the container name from the `docker ps` command. The run order should be "database" then "code".
+Alternatively you can stop and start individual services with `docker stop conainer_name` and `docker start container_name` where `container_name` is the container name from the `docker ps` command. The run order should be "database" then "game".
 
 ## Connect to server terminal
 
-If you need to access the terminal on the server you can enter `docker exe -it topaz_code_1 sh` where `topaz_code_1` is the container name from the `docker ps` command. To exit type `exit`.
+If you need to access the terminal on the server you can enter `docker exe -it topaz_game_1 sh` where `topaz_game_1` is the container name from the `docker ps` command. To exit type `exit`.
 
 ## Transfer files to server from local machine
 
-If you need to transfer files from your local machine to the server you can use the `docker cp` command. All code on the server exists in the `/code` directory. See below for example.
+If you need to transfer files from your local machine to the server you can use the `docker cp` command. All code on the server exists in the `/topaz` directory. See below for example.
 This is useful for things like updating and testing the lua scripts without needing to restart the server.
 
-Example copying godmode.lua script from local machine to server (where server name is `topaz_code_1`):
-`docker cp scripts/commands/godmode.lua topaz_code_1:/code/scripts/commands/godmode.lua`
+Example copying godmode.lua script from local machine to server (where server name is `topaz_game_1`):
+`docker cp scripts/commands/godmode.lua topaz_game_1:/topaz/scripts/commands/godmode.lua`

Dockerfile

@@ -10,22 +10,19 @@ ENV TPZ_DB_USER=topazadmin
 ENV TPZ_DB_USER_PASSWD=topazisawesome
 ENV TPZ_DB_NAME=tpzdb
 
-# Working directory will be /code meaning that the contents of topaz will exist in /code
-WORKDIR /code
+# Working directory will be /topaz meaning that the contents of topaz will exist in /topaz
+WORKDIR /topaz
 
 # Update and install all requirements as well as some useful tools such as net-tools and nano
 RUN apt update && apt install -y net-tools nano build-essential software-properties-common g++-8 luajit-5.1-dev libzmq3-dev luarocks python3.7 cmake pkg-config g++ dnsutils git mariadb-server libluajit-5.1-dev libzmq3-dev autoconf pkg-config zlib1g-dev libssl-dev python3.6-dev libmysqlclient-dev
 
-# Copy everything from the host machine topaz folder to /code
-ADD . /code
+# Copy everything from the host machine topaz folder to /topaz
+ADD . /topaz
 
-RUN mkdir build && cd build && cmake .. && make -j $(nproc) && cd .. && rm -r /code/build
+RUN mkdir build && cd build && cmake .. && make -j $(nproc) && cd .. && rm -r /topaz/build
 
 # Copy the docker config files to the conf folder instead of the default config
 COPY /conf/default/* conf/
 
 # Startup the server when the container starts
-ENTRYPOINT ./tools/waitfordb.sh && \
-nohup ./topaz_connect > topaz_connect.log & \
-nohup ./topaz_game > topaz_game.log & \
-./topaz_search > topaz_search.log
+ENTRYPOINT ./tools/wait_for_db_then_launch.sh

docker-compose.yml

@@ -17,7 +17,7 @@ services:
       - "3306:3306"
 
   # Ease of access tool for the DB, you can type in localhost:8080 to get a web interface to the DB. You can log in with root:topazisawesome
-  adminer:
+  db-admin-portal:
     image: adminer
     restart: always
     depends_on: 
@@ -26,7 +26,7 @@ services:
       - 8080:8080
 
   # The server service
-  code:
+  game:
     # Build whatever is in the Dockerfile in the topaz root folder
     build: .
     depends_on:
@@ -39,4 +39,4 @@ services:
       # topaz_search
       - "54002:54002/tcp"
       # topaz_game
-      - "54230:54230/udp"
+      - "54230:54230/udp"

tools/wait_for_db_then_launch.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+while ! mysql --host=$TPZ_DB_HOST --port=$TPZ_DB_PORT --user=$TPZ_DB_USER --password=$TPZ_DB_USER_PASSWD -e "USE $TPZ_DB_NAME; SELECT 1 FROM zone_weather LIMIT 1"; do
+    sleep 5
+done
+sleep 5
+echo "starting topaz_connect"
+nohup ./topaz_connect > topaz_connect.log &
+sleep 5
+echo "starting topaz_game"
+nohup ./topaz_game > topaz_game.log &
+sleep 5
+echo "starting topaz_search"
+./topaz_search > topaz_search.log