diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/acore-docker-build | 19 | ||||
| -rw-r--r-- | bin/acore-docker-update | 7 |
2 files changed, 19 insertions, 7 deletions
diff --git a/bin/acore-docker-build b/bin/acore-docker-build index 1e3d050d76..d7cc6e244e 100755 --- a/bin/acore-docker-build +++ b/bin/acore-docker-build @@ -1,15 +1,20 @@ #!/usr/bin/env bash -bash acore.sh compiler build && bash acore.sh db-assembler import-all +cd /azerothcore -CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -ENV_PATH=$(readlink -f "$CUR_PATH/../env") +bash acore.sh compiler build echo "Generating confs..." -cp -n "$ENV_PATH/docker/etc/worldserver.conf.dockerdist" "$ENV_PATH/dist/etc/worldserver.conf" -cp -n "$ENV_PATH/docker/etc/authserver.conf.dockerdist" "$ENV_PATH/dist/etc/authserver.conf" +cp -n "env/docker/etc/worldserver.conf.dockerdist" "env/dist/etc/worldserver.conf" +cp -n "env/docker/etc/authserver.conf.dockerdist" "env/dist/etc/authserver.conf" echo "Fixing EOL..." -dos2unix "$ENV_PATH/dist/etc/"* +# using -n (new file mode) should also fix the issue +# when the file is created with the default acore user but you +# set a different user into the docker configurations +for file in "env/dist/etc/"* +do + dos2unix -n $file $file +done + diff --git a/bin/acore-docker-update b/bin/acore-docker-update new file mode 100644 index 0000000000..0b91b50fb6 --- /dev/null +++ b/bin/acore-docker-update @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +CUR_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +source "$CUR_PATH/acore-docker-build" + +bash acore.sh db-assembler import-all |