diff options
| author | Yehonal <yehonal.azeroth@gmail.com> | 2021-04-28 22:26:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 22:26:39 +0200 |
| commit | e4fafc61dd966b6077f4cd575c575473f0643d88 (patch) | |
| tree | 764f11a02955b508ff9e607eba905cb45d04651a /conf | |
| parent | 5954d9c739778919bdeb1affe613d69eeb7c2774 (diff) | |
fix(Docker): windows improvements and permissions fix (#5444)
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/dist/config.sh | 2 | ||||
| -rw-r--r-- | conf/dist/env.docker | 24 |
2 files changed, 15 insertions, 11 deletions
diff --git a/conf/dist/config.sh b/conf/dist/config.sh index c9ef22abc7..d6bd5534b8 100644 --- a/conf/dist/config.sh +++ b/conf/dist/config.sh @@ -102,7 +102,7 @@ readarray -td, DATABASES <<<"$DBLIST"; OUTPUT_FOLDER=${OUTPUT_FOLDER:-"$AC_PATH_ROOT/env/dist/sql/"} -DBASM_WAIT_TIMEOUT=${DBASM_WAIT_TIMEOUT:-1} +DBASM_WAIT_TIMEOUT=${DBASM_WAIT_TIMEOUT:-5} DBASM_WAIT_RETRIES=${DBASM_WAIT_RETRIES:-3} ####### BACKUP diff --git a/conf/dist/env.docker b/conf/dist/env.docker index 28e91af917..434782c2d1 100644 --- a/conf/dist/env.docker +++ b/conf/dist/env.docker @@ -5,19 +5,23 @@ DOCKER_AC_ENV_FILE= -DOCKER_DATA=./env/docker/data -DOCKER_ETC=./env/docker/etc -DOCKER_LOGS=./env/docker/logs -DOCKER_CONF=./conf +DOCKER_VOL_DATA= +DOCKER_VOL_ETC= +DOCKER_VOL_LOGS= +DOCKER_VOL_CONF= -DOCKER_WORLD_EXTERNAL_PORT=8085 -DOCKER_AUTH_EXTERNAL_PORT=3724 -DOCKER_DB_EXTERNAL_PORT=3306 -DOCKER_DB_ROOT_PASSWORD=password -DOCKER_SOAP_EXTERNAL_PORT=7878 +DOCKER_WORLD_EXTERNAL_PORT= +DOCKER_SOAP_EXTERNAL_PORT= +DOCKER_AUTH_EXTERNAL_PORT= +DOCKER_DB_EXTERNAL_PORT= +DOCKER_DB_ROOT_PASSWORD= + +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=abstract-bind +DOCKER_EXTENDS_BIND= |