From e4016823d7ee5e77aa6cb162a3eed584d7b35a87 Mon Sep 17 00:00:00 2001 From: Yehonal Date: Mon, 7 Nov 2022 13:20:48 +0100 Subject: feat(CORE): docker permissions and rework (#13454) - fix docker permissions with mounted volumes on new docker versions (https://github.com/docker/desktop-linux/issues/31) - fix ac-tools image - cleanup unused env - add `cap_add: SYS_NICE` to allow setting process high priority - fix ccache in docker - allow to switch between root user (default) to acore user in any container - fix cache of the downloaded client data - split docker github actions in 2 parts - versioning mysql images - performance improvements --- conf/dist/env.ac | 12 ------------ conf/dist/env.docker | 14 +++++++------- 2 files changed, 7 insertions(+), 19 deletions(-) (limited to 'conf') diff --git a/conf/dist/env.ac b/conf/dist/env.ac index ed6169223f..3f17c4d820 100644 --- a/conf/dist/env.ac +++ b/conf/dist/env.ac @@ -13,18 +13,6 @@ CTYPE=RelWithDebInfo CSCRIPTS=static AC_CCACHE=true -# -# DATABASE -# - -OUTPUT_FOLDER=/azerothcore/var/build/sql/ - -DB_AUTH_CONF="MYSQL_USER='root'; MYSQL_PASS='password'; MYSQL_HOST='ac-database'; MYSQL_PORT='3306';" - -DB_CHARACTERS_CONF="MYSQL_USER='root'; MYSQL_PASS='password'; MYSQL_HOST='ac-database'; MYSQL_PORT='3306';" - -DB_WORLD_CONF="MYSQL_USER='root'; MYSQL_PASS='password'; MYSQL_HOST='ac-database'; MYSQL_PORT='3306';" - # # SIMPLE RESTARTER # diff --git a/conf/dist/env.docker b/conf/dist/env.docker index 61f8fd965f..030f20d9f3 100644 --- a/conf/dist/env.docker +++ b/conf/dist/env.docker @@ -5,10 +5,15 @@ DOCKER_AC_ENV_FILE= -DOCKER_VOL_DATA= +DOCKER_VOL_ROOT= +DOCKER_VOL_CONF= DOCKER_VOL_ETC= DOCKER_VOL_LOGS= -DOCKER_VOL_CONF= +DOCKER_VOL_DATA_CAMERAS= +DOCKER_VOL_DATA_DBC= +DOCKER_VOL_DATA_MAPS= +DOCKER_VOL_DATA_VMAPS= +DOCKER_VOL_DATA_MMAPS= DOCKER_WORLD_EXTERNAL_PORT= DOCKER_SOAP_EXTERNAL_PORT= @@ -20,8 +25,3 @@ DOCKER_USER= DOCKER_USER_ID= DOCKER_GROUP_ID= -# To maximize the performance on MAC you can change the DOCKER_EXTENDS_BIND variable -# to "abstract-no-bind", however it won't bind the host directory inside the container. -# It means that you need to work directly within the container using a tool -# like the VScode dev-container of the remote-extension suite -DOCKER_EXTENDS_BIND= -- cgit v1.2.3