Skip to content

Commit 287f173

Browse files
missytakeKeonik1
andcommitted
Suggestions from @Keonik1
Co-authored-by: Keonik <[email protected]>
1 parent e6ac6b2 commit 287f173

File tree

3 files changed

+13
-6
lines changed

3 files changed

+13
-6
lines changed

docker/files/setup_chatmail_docker.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ monitor_certificates() {
4848

4949
### MAIN
5050

51-
if [ "$DEBUG_COMMANDS_ENABLED" == "true" ]; then
51+
if [ "$DEBUG_COMMANDS_ENABLED" = true ]; then
5252
debug_commands
5353
fi
5454

55-
if [ "$FORCE_REINIT_INI_FILE" == "true" ]; then
55+
if [ "$FORCE_REINIT_INI_FILE" = true ]; then
5656
INI_CMD_ARGS=--force
5757
fi
5858

@@ -62,15 +62,15 @@ chown opendkim:opendkim /etc/dkimkeys/opendkim.txt
6262

6363
# TODO: Move to debug_commands after git clone is moved to dockerfile.
6464
git config --global --add safe.directory /opt/chatmail
65-
if [ "$RECREATE_VENV" == "true" ]; then
65+
if [ "$RECREATE_VENV" = true ]; then
6666
rm -rf venv
6767
fi
6868
./scripts/initenv.sh
6969

70-
./scripts/cmdeploy init --config "${INI_FILE}" $INI_CMD_ARGS $MAIL_DOMAIN
70+
./scripts/cmdeploy init --config "${INI_FILE}" $INI_CMD_ARGS $MAIL_DOMAIN || true
7171
bash /update_ini.sh
7272

73-
./scripts/cmdeploy run --ssh-host docker
73+
./scripts/cmdeploy run --ssh-host @docker
7474

7575
echo "ForwardToConsole=yes" >> /etc/systemd/journald.conf
7676
systemctl restart systemd-journald

docs/DOCKER_INSTALLATION_EN.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,11 @@ Please substitute it with your own domain.
3838
```shell
3939
cp ./docker/docker-compose-default.yaml docker-compose.yaml
4040
```
41+
2. Copy `./docker/example.env` and rename it to `.env`. This file stores variables used in `docker-compose.yaml`.
4142

43+
```shell
44+
cp ./docker/example.env .env
45+
```\
4246
3. Configure environment variables in the `.env` file. These variables are used in the `docker-compose.yaml` file to pass repeated values.
4347
4448
4. Configure kernel parameters because they cannot be changed inside the container, specifically `fs.inotify.max_user_instances` and `fs.inotify.max_user_watches`. Run the following:

docs/DOCKER_INSTALLATION_RU.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,10 @@ Please substitute it with your own domain.
3434
```shell
3535
cp ./docker/docker-compose-default.yaml docker-compose.yaml
3636
```
37-
37+
2. Скопировать `./docker/example.env` и переименовать в `.env`. Здесь хранятся переменные, которые используются в `docker-compose.yaml`.
38+
```shell
39+
cp ./docker/example.env .env
40+
```\
3841
3. Настроить переменные окружения в `.env` файле. Эти переменные используются в `docker-compose.yaml` файле, чтобы передавать повторяющиеся значения.
3942
4043
4. Настроить параметры ядра, потому что внутри контейнера их нельзя изменить, а конкретно `fs.inotify.max_user_instances` и `fs.inotify.max_user_watches`. Для этого выполнить следующее:

0 commit comments

Comments
 (0)