summaryrefslogtreecommitdiff
path: root/apps/bash_shared/common.sh
diff options
context:
space:
mode:
authorYehonal <yehonal.azeroth@gmail.com>2021-04-22 09:57:05 +0200
committerGitHub <noreply@github.com>2021-04-22 09:57:05 +0200
commit380f406248bdc1f15227a7b2f8a75b4bf922f730 (patch)
tree497bb589f7bd80073ea755f14e33505ff572353b /apps/bash_shared/common.sh
parent4a8faafaff2753349ea15aa602cc3816f4e42de6 (diff)
Feat(Docker/bash): docker-compose system rework (#4488)
## ⚠️ATTENTION! ⚠️ Upgrading procedure: **Database:** After this PR will be merged you need to backup your DB first (you can use the db-assembler or any mysql client to generate the dump) and restore it after. The reason is that we use now docker named volumes instead of binded ones to improve performance. **Conf & client data**: if you use the default configuration, both the etc and the data folder are now available inside the **/env/docker**. Finally, you can cleanup the /docker folder previously used by our system. ## Changes Proposed: This PR will implement the [devcontainer ](https://code.visualstudio.com/docs/remote/containers) feature for VSCode. Allowing us to develop and debug directly within the container in the same way on all OSes. * Implemented support for vscode dev-container feature by remote-extension suite * Docker performance optimizations for MacOS and non-linux hosts * Bash system improvements * Implemented first command using Deno runtime environment (typescript) and [commander.js] * Implemented wait mechanism for db_assembler * Implemented db migration command * possibility to run the authserver and worldserver with GDB using the integrated simple-restarter * Implemented docker multi-stage mechanism to use one single Dockerfile for all the services * client-data downloader now creates a placeholder to avoid downloading the same version of data files multiple times * deployment of pre-compiled docker images on [docker hub](https://hub.docker.com/u/acore), you can test them [here](https://github.com/azerothcore/acore-docker)
Diffstat (limited to 'apps/bash_shared/common.sh')
-rw-r--r--apps/bash_shared/common.sh15
1 files changed, 9 insertions, 6 deletions
diff --git a/apps/bash_shared/common.sh b/apps/bash_shared/common.sh
index ed0859319c..c8d8880cf8 100644
--- a/apps/bash_shared/common.sh
+++ b/apps/bash_shared/common.sh
@@ -1,12 +1,15 @@
-function registerHooks() { hwc_event_register_hooks "$@"; }
-function runHooks() { hwc_event_run_hooks "$@"; }
+function registerHooks() { acore_event_registerHooks "$@"; }
+function runHooks() { acore_event_runHooks "$@"; }
source "$AC_PATH_CONF/dist/config.sh" # include dist to avoid missing conf variables
-if [ -f "$AC_PATH_CONF/config.sh" ]; then
- source "$AC_PATH_CONF/config.sh" # should overwrite previous
+# first check if it's defined in env, otherwise use the default
+USER_CONF_PATH=${USER_CONF_PATH:-"$AC_PATH_CONF/config.sh"}
+
+if [ -f "$USER_CONF_PATH" ]; then
+ source "$USER_CONF_PATH" # should overwrite previous
else
- echo "NOTICE: file <$AC_PATH_CONF/config.sh> has not been found, you should create and configure it."
+ echo "NOTICE: file <$USER_CONF_PATH> has not been found, you should create and configure it."
fi
#
@@ -15,7 +18,7 @@ fi
for entry in "$AC_PATH_MODULES/"*/include.sh
do
- if [ -e "$entry" ]; then
+ if [ -e "$entry" ]; then
source "$entry"
fi
done