Skip to content

Commit 31c4037

Browse files
Keonik1missytake
authored andcommitted
add RECREATE_VENV var
#614 (comment)
1 parent 9c16009 commit 31c4037

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

docker/docker-compose-default.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ services:
2323
MAIL_DOMAIN: <your_domain>
2424
CHANGE_KERNEL_SETTINGS: "False"
2525
ACME_EMAIL: <your_email>
26-
27-
MAX_MESSAGE_SIZE: "50M"
26+
# RECREATE_VENV: "false"
27+
# MAX_MESSAGE_SIZE: "50M"
2828
# DEBUG_COMMANDS_ENABLED: "true"
2929
# FORCE_REINIT_INI_FILE: "true"
3030
# USE_FOREIGN_CERT_MANAGER: "True"

docker/files/setup_chatmail_docker.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ export ENABLE_CERTS_MONITORING="${ENABLE_CERTS_MONITORING:-true}"
66
export CERTS_MONITORING_TIMEOUT="${CERTS_MONITORING_TIMEOUT:-60}"
77
export PATH_TO_SSL_CONTAINER="${PATH_TO_SSL_CONTAINER:-/var/lib/acme/live/${MAIL_DOMAIN}}"
88
export CHANGE_KERNEL_SETTINGS=${CHANGE_KERNEL_SETTINGS:-"False"}
9+
export RECREATE_VENV=${RECREATE_VENV:-"false"}
910

1011
if [ -z "$MAIL_DOMAIN" ]; then
1112
echo "ERROR: Environment variable 'MAIL_DOMAIN' must be set!" >&2
@@ -61,6 +62,9 @@ chown opendkim:opendkim /etc/dkimkeys/opendkim.txt
6162

6263
# TODO: Move to debug_commands after git clone is moved to dockerfile.
6364
git config --global --add safe.directory /opt/chatmail
65+
if [ "$RECREATE_VENV" == "true" ]; then
66+
rm -rf venv
67+
fi
6468
./scripts/initenv.sh
6569

6670
./scripts/cmdeploy init --config "${INI_FILE}" $INI_CMD_ARGS $MAIL_DOMAIN

docs/DOCKER_INSTALLATION_EN.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ sudo sysctl --system
5353
- `DEBUG_COMMANDS_ENABLED` – Run debug commands before installation. (default: `false`)
5454
- `FORCE_REINIT_INI_FILE` – Recreate the ini configuration file on startup. (default: `false`)
5555
- `USE_FOREIGN_CERT_MANAGER` – Use a third-party certificate manager. (default: `false`)
56+
- `RECREATE_VENV` - Recreate the virtual environment (venv). If set to `true`, the environment will be recreated when the container starts, which will increase the startup time of the service but can help avoid certain errors. (default: `false`)
5657
- `INI_FILE` – Path to the ini configuration file. (default: `./chatmail.ini`)
5758
- `PATH_TO_SSL_CONTAINER` – Path to where the certificates are stored. (default: `/var/lib/acme/live/${MAIL_DOMAIN}`)
5859
- `ENABLE_CERTS_MONITORING` – Enable certificate monitoring if `USE_FOREIGN_CERT_MANAGER=true`. If certificates change, services will be automatically restarted. (default: `false`)

docs/DOCKER_INSTALLATION_RU.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ sudo sysctl --system
4747
- `DEBUG_COMMANDS_ENABLED` - Выполнить debug команды перед установкой. (default: `false`)
4848
- `FORCE_REINIT_INI_FILE` - Пересоздавать ini файл конфигурации при запуске. (default: `false`)
4949
- `USE_FOREIGN_CERT_MANAGER` - Использовать сторонний менеджер сертификатов. (default: `false`)
50+
- `RECREATE_VENV` - Пересоздать виртуальное окружение (venv). Если выставлено `true`, то окружение будет пересоздано при запуске контейнера, из-за чего включение сервиса займет больше времени, но поможет избежать ряда ошибок. (default: `false`)
5051
- `INI_FILE` - путь к ini файлу конфигурации. (default: `./chatmail.ini`)
5152
- `PATH_TO_SSL_CONTAINER` - Путь где располагаются сертификаты. (default: `/var/lib/acme/live/${MAIL_DOMAIN}`)
5253
- `ENABLE_CERTS_MONITORING` - Включить мониторинг сертификатов, если `USE_FOREIGN_CERT_MANAGER=true`. Если сертфикаты изменятся сервисы будут автоматически перезапущены. (default: `false`)

0 commit comments

Comments
 (0)