Fix start scripts (#8005)

* fix(Bash): Handle missing env variable

Bash installation failed when no explicit `zipPath` was set.
As it defaulted to `/`, which led to permission errors.

* fix(Docker): Fix docker volume error

Docker installation failed, because target directories of volumes should
not end with a `/`.

https://stackoverflow.com/questions/68273745/how-to-make-a-mount-shared-in-docker/68455665#68455665
This commit is contained in:
marcelhas
2021-10-01 10:33:35 +02:00
committed by GitHub
parent 23edbfe21d
commit 7001865186
2 changed files with 3 additions and 3 deletions

View File

@@ -227,7 +227,7 @@ function inst_download_client_data {
# first check if it's defined in env, otherwise use the default
local path="${DATAPATH:-$AC_BINPATH_FULL}"
local zipPath="${DATAPATH_ZIP:-"$DATAPATH/data.zip"}"
local zipPath="${DATAPATH_ZIP:-"$path/data.zip"}"
dataVersionFile="$path/data-version"

View File

@@ -32,7 +32,7 @@ services:
abstract-bind:
image: local/azerothcore/abstract-bind
volumes:
- .:/azerothcore/
- .:/azerothcore
# expose some dist folder outside allowing the host to use them
- ${DOCKER_VOL_CONF:-./conf}:/azerothcore/conf
- ${DOCKER_VOL_BIN:-ac-bin}:/azerothcore/env/dist/bin
@@ -45,7 +45,7 @@ services:
abstract-no-bind:
image: local/azerothcore/abstract-no-bind
volumes:
- ac-proj:/azerothcore/
- ac-proj:/azerothcore
profiles: [abstract-service] # do not run this
#=======================