public/mailcow-dockerized
1
0
Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-07-02 02:55:47 +00:00
Code Issues Releases Wiki Activity

Set HOST env vars

Browse Source
This commit is contained in:
FreddleSpl0it
2025-06-02 15:53:39 +02:00
parent 909eb8a63a
commit 4cc463a728
2 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/conf/nginx/config_templates/nginx.conf.j2
+3 -3
View File
@@ -130,7 +130,7 @@ http {
location ~ \.php$ { location ~ \.php$ {
try_files $uri =404; try_files $uri =404;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass {{ PHPFPMHOST }}:9001; fastcgi_pass {{ PHPFPM_HOST }}:9001;
fastcgi_index index.php; fastcgi_index index.php;
include fastcgi_params; include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
@@ -151,7 +151,7 @@ http {
client_max_body_size 10M; client_max_body_size 10M;
try_files $uri =404; try_files $uri =404;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass {{ PHPFPMHOST }}:9001; fastcgi_pass {{ PHPFPM_HOST }}:9001;
fastcgi_index pipe.php; fastcgi_index pipe.php;
include fastcgi_params; include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
@@ -175,7 +175,7 @@ http {
client_max_body_size 10M; client_max_body_size 10M;
try_files $uri =404; try_files $uri =404;
fastcgi_split_path_info ^(.+\.php)(/.+)$; fastcgi_split_path_info ^(.+\.php)(/.+)$;
fastcgi_pass phpfpm:9001; fastcgi_pass {{ PHPFPM_HOST }}:9001;
include fastcgi_params; include fastcgi_params;
fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
fastcgi_param PATH_INFO $fastcgi_path_info; fastcgi_param PATH_INFO $fastcgi_path_info;
docker-compose.yml
+19 -3
View File
@@ -35,6 +35,8 @@ services:
- MYSQL_USER=${DBUSER} - MYSQL_USER=${DBUSER}
- MYSQL_PASSWORD=${DBPASS} - MYSQL_PASSWORD=${DBPASS}
- MYSQL_INITDB_SKIP_TZINFO=1 - MYSQL_INITDB_SKIP_TZINFO=1
- DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
- REDIS_HOST=${REDIS_HOST:-redis-mailcow}
restart: always restart: always
ports: ports:
- "${SQL_PORT:-127.0.0.1:13306}:3306" - "${SQL_PORT:-127.0.0.1:13306}:3306"
@@ -79,6 +81,8 @@ services:
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
- DBPASS=${DBPASS} - DBPASS=${DBPASS}
- DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
- REDIS_HOST=${REDIS_HOST:-redis-mailcow}
- TZ=${TZ} - TZ=${TZ}
- SKIP_CLAMD=${SKIP_CLAMD:-n} - SKIP_CLAMD=${SKIP_CLAMD:-n}
volumes: volumes:
@@ -108,6 +112,8 @@ services:
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-} - REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-} - REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS} - REDISPASS=${REDISPASS}
- DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
- REDIS_HOST=${REDIS_HOST:-redis-mailcow}
- SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-} - SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-}
volumes: volumes:
- ./data/hooks/rspamd:/hooks:Z - ./data/hooks/rspamd:/hooks:Z
@@ -171,6 +177,8 @@ services:
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
- DBPASS=${DBPASS} - DBPASS=${DBPASS}
- DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
- REDIS_HOST=${REDIS_HOST:-redis-mailcow}
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME} - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
- MAILCOW_PASS_SCHEME=${MAILCOW_PASS_SCHEME:-BLF-CRYPT} - MAILCOW_PASS_SCHEME=${MAILCOW_PASS_SCHEME:-BLF-CRYPT}
- IMAP_PORT=${IMAP_PORT:-143} - IMAP_PORT=${IMAP_PORT:-143}
@@ -234,6 +242,7 @@ services:
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-} - REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS} - REDISPASS=${REDISPASS}
- DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock} - DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
- REDIS_HOST=${REDIS_HOST:-redis-mailcow}
- SOGO_HOST=${SOGO_HOST:-172.22.1.248} - SOGO_HOST=${SOGO_HOST:-172.22.1.248}
- DOVECOT_HOST=${DOVECOT_HOST:-172.22.1.250} - DOVECOT_HOST=${DOVECOT_HOST:-172.22.1.250}
- POSTFIX_HOST=${POSTFIX_HOST:-172.22.1.253} - POSTFIX_HOST=${POSTFIX_HOST:-172.22.1.253}
@@ -323,6 +332,8 @@ services:
- REDISPASS=${REDISPASS} - REDISPASS=${REDISPASS}
- COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-mailcow-dockerized} - COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME:-mailcow-dockerized}
- SOGO_HOST=${SOGO_HOST:-172.22.1.248} - SOGO_HOST=${SOGO_HOST:-172.22.1.248}
- DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
- REDIS_HOST=${REDIS_HOST:-redis-mailcow}
ports: ports:
- "${DOVEADM_PORT:-127.0.0.1:19991}:12345" - "${DOVEADM_PORT:-127.0.0.1:19991}:12345"
- "${IMAP_PORT:-143}:143" - "${IMAP_PORT:-143}:143"
@@ -372,7 +383,7 @@ services:
volumes: volumes:
- ./data/hooks/postfix:/hooks:Z - ./data/hooks/postfix:/hooks:Z
- ./data/conf/postfix:/service_config:z - ./data/conf/postfix:/service_config:z
- ./data/conf/postfix:/opt/postfix/conf:z - ./data/conf/postfix/postscreen_access.cidr:/opt/postfix/conf/postscreen_access.cidr:z
- ./data/assets/ssl:/etc/ssl/mail/:ro,z - ./data/assets/ssl:/etc/ssl/mail/:ro,z
- postfix-vol-1:/var/spool/postfix - postfix-vol-1:/var/spool/postfix
- crypt-vol-1:/var/lib/zeyple - crypt-vol-1:/var/lib/zeyple
@@ -390,6 +401,8 @@ services:
- REDISPASS=${REDISPASS} - REDISPASS=${REDISPASS}
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME} - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
- SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-} - SPAMHAUS_DQS_KEY=${SPAMHAUS_DQS_KEY:-}
- DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
- REDIS_HOST=${REDIS_HOST:-redis-mailcow}
cap_add: cap_add:
- NET_BIND_SERVICE - NET_BIND_SERVICE
ports: ports:
@@ -440,8 +453,9 @@ services:
- DISABLE_IPv6=${DISABLE_IPv6:-n} - DISABLE_IPv6=${DISABLE_IPv6:-n}
- HTTP_REDIRECT=${HTTP_REDIRECT:-n} - HTTP_REDIRECT=${HTTP_REDIRECT:-n}
- PHPFPM_HOST=${PHPFPM_HOST:-php-fpm-mailcow} - PHPFPM_HOST=${PHPFPM_HOST:-php-fpm-mailcow}
- RSPAM_DHOST=${RSPAMD_HOST:-rspamd-mailcow} - RSPAMD_HOST=${RSPAMD_HOST:-rspamd-mailcow}
- SOGO_HOST=${SOGO_HOST:-${IPV4_NETWORK:-172.22.1}.248} - SOGO_HOST=${SOGO_HOST:-${IPV4_NETWORK:-172.22.1}.248}
- DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
- REDIS_HOST=${REDIS_HOST:-redis-mailcow} - REDIS_HOST=${REDIS_HOST:-redis-mailcow}
- IPV4_NETWORK=${IPV4_NETWORK:-172.22.1} - IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
- NGINX_USE_PROXY_PROTOCOL=${NGINX_USE_PROXY_PROTOCOL:-n} - NGINX_USE_PROXY_PROTOCOL=${NGINX_USE_PROXY_PROTOCOL:-n}
@@ -606,7 +620,7 @@ services:
- watchdog - watchdog
dockerapi-mailcow: dockerapi-mailcow:
image: ghcr.io/mailcow/dockerapi:2.11 image: ghcr.io/mailcow/dockerapi:nightly-19052025
security_opt: security_opt:
- label=disable - label=disable
restart: always restart: always
@@ -618,6 +632,8 @@ services:
- REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-} - REDIS_SLAVEOF_IP=${REDIS_SLAVEOF_IP:-}
- REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-} - REDIS_SLAVEOF_PORT=${REDIS_SLAVEOF_PORT:-}
- REDISPASS=${REDISPASS} - REDISPASS=${REDISPASS}
- DB_HOST=${DB_HOST:-/var/run/mysqld/mysqld.sock}
- REDIS_HOST=${REDIS_HOST:-redis-mailcow}
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
networks: networks: