From f36c781c692320c6a0c3a43375fecceed4b124b0 Mon Sep 17 00:00:00 2001 From: root <1510183@gmail.com> Date: Fri, 7 Aug 2020 15:21:28 +0000 Subject: [PATCH] update env files location --- .gitignore | 4 ++-- docker-compose.yml | 6 +++--- ireddocker/docker-entrypoint.sh | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f6072c0..cdab904 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -/ireddocker/main.cvd -/ireddocker/iredmail-env.conf +/envfiles/mariadb-env.conf +/envfiles/iredmail-env.conf /cert_dir/* /mail_dir/* diff --git a/docker-compose.yml b/docker-compose.yml index 0685deb..a699728 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,8 +9,8 @@ services: master_mariadb: image: mariadb:10.5.4-focal container_name: master_mariadb - environment: - MYSQL_ROOT_PASSWORD: "123qweASD" + env_file: + - envfiles/mariadb-env.conf ports: - "3306:3306" volumes: @@ -25,7 +25,7 @@ services: container_name: iredmail hostname: mail.resds.ru env_file: - - ireddocker/iredmail-env.conf + - envfiles/iredmail-env.conf ports: - "110:110" - "995:995" diff --git a/ireddocker/docker-entrypoint.sh b/ireddocker/docker-entrypoint.sh index 7e23ae4..4bea65f 100644 --- a/ireddocker/docker-entrypoint.sh +++ b/ireddocker/docker-entrypoint.sh @@ -420,8 +420,8 @@ sed -i 's/ENABLED=0/ENABLED=1/g' /etc/default/spamassassin if [[ X"${LDAP_EXTERNAL_USE}" != X'YES' || X"${LDAP_EXTERNAL_USE}" != X'yes' ]]; then service slapd restart - service iredapd restart - fi + /usr/bin/python3 /opt/iredapd/iredapd.py & + fi while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do sleep 5 @@ -471,7 +471,7 @@ else if [[ X"${LDAP_EXTERNAL_USE}" != X'YES' || X"${LDAP_EXTERNAL_USE}" != X'yes' ]]; then service slapd start - service iredapd start + /usr/bin/python3 /opt/iredapd/iredapd.py & fi while mysqladmin ping -h"${MYSQL_SERVER_ADDRESS}" --silent; do