Adapta mail a Swarm (357846b5) · Commits · REDMIC Project / Service deployment

.gitlab-ci.yml

+12 −8

Original line number	Diff line number	Diff line
		@@ -109,16 +109,16 @@ deploy-mail-server-dev:
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		script:
		- create-nets.sh mail-net
		- export DEPLOY_DIR_NAME=mail/mariadb SERVICE=mail-mariadb IMAGE_TAG=10.2
		- export DEPLOY_DIR_NAME=mail/mariadb STACK=mail SERVICES_TO_CHECK=mail_mail-mariadb IMAGE_TAG=10.2
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD}
		MYSQL_PASSWORD=${DB_PASSWORD}
		- export DEPLOY_DIR_NAME=mail/redis SERVICE=mail-redis IMAGE_TAG=4.0-alpine
		- export DEPLOY_DIR_NAME=mail/redis STACK=mail SERVICES_TO_CHECK=mail_mail-redis IMAGE_TAG=4.0-alpine
		- deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		- export DEPLOY_DIR_NAME=mail/mailserver SERVICE=mail-mailserver IMAGE_TAG=1.1-latest
		- export DEPLOY_DIR_NAME=mail/mailserver STACK=mail SERVICES_TO_CHECK=mail_mail-mailserver IMAGE_TAG=1.1-latest
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} RSPAMD_PASSWORD=${RSPAMD_PASSWORD}
		DBPASS=${DB_PASSWORD}
		DBPASS=${DB_PASSWORD} PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME}
		environment:
		name: dev/rspamd
		url: https://spam.${DEV_PUBLIC_HOSTNAME}
		@@ -131,11 +131,14 @@ deploy-mail-admin-dev:
		variables:
		DEPLOY_DIR_NAME: mail/postfixadmin
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: mail-postfixadmin
		STACK: mail
		SERVICES_TO_CHECK: mail_mail-postfixadmin
		IMAGE_TAG: latest
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		script:
		- deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} DBPASS=${DB_PASSWORD}
		- >
		deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} DBPASS=${DB_PASSWORD}
		PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME}
		environment:
		name: dev/postfixadmin
		url: https://postfixadmin.${DEV_PUBLIC_HOSTNAME}
		@@ -148,11 +151,12 @@ deploy-mail-client-dev:
		variables:
		DEPLOY_DIR_NAME: mail/rainloop
		SSH_REMOTE: ${DEV_SSH_REMOTE}
		SERVICE: mail-rainloop
		STACK: mail
		SERVICES_TO_CHECK: mail_mail-rainloop
		IMAGE_TAG: latest
		COMPOSE_FILE: docker-compose.tmpl.yml:docker-compose.dev.yml
		script:
		- deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE}
		- deploy.sh IMAGE_TAG=${IMAGE_TAG} COMPOSE_FILE=${COMPOSE_FILE} PUBLIC_HOSTNAME=${DEV_PUBLIC_HOSTNAME}
		environment:
		name: dev/rainloop
		url: https://webmail.${DEV_PUBLIC_HOSTNAME}

mail/mailserver/docker-compose.dev.yml

+21 −2

Original line number	Diff line number	Diff line
		@@ -2,8 +2,6 @@ version: '3.5'

		services:
		mail-mailserver:
		container_name: mail-mailserver
		restart: on-failure:3
		ports:
		- "25:25"
		- "143:143"
		@@ -11,6 +9,27 @@ services:
		- "993:993"
		- "4190:4190"
		- "${RSPAMD_PORT}:${RSPAMD_PORT}"
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "${RSPAMD_PORT}"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: Host:spam.${PUBLIC_HOSTNAME}
		traefik.backend: mailserver
		placement:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 10s
		window: 1m
		resources:
		limits:
		cpus: '0.5'
		memory: 1G
		reservations:
		memory: 820M

		volumes:
		mail-mailserver-vol:

mail/mailserver/docker-compose.tmpl.yml

+3 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@ services:
		hostname: ${HOST_NAME}
		networks:
		- mail-net
		- traefik-net
		volumes:
		- mail-mailserver-vol:/var/mail
		environment:
		@@ -19,3 +20,5 @@ services:
		networks:
		mail-net:
		external: true
		traefik-net:
		external: true

mail/mariadb/docker-compose.dev.yml

+16 −2

Original line number	Diff line number	Diff line
		@@ -2,8 +2,22 @@ version: '3.5'

		services:
		mail-mariadb:
		container_name: mail-mariadb
		restart: on-failure:3
		deploy:
		mode: replicated
		replicas: 1
		placement:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 10s
		window: 1m
		resources:
		limits:
		cpus: '0.5'
		memory: 128M
		reservations:
		memory: 103M

		volumes:
		mail-mariadb-vol:

mail/postfixadmin/docker-compose.dev.yml

+21 −2

Original line number	Diff line number	Diff line
		@@ -2,7 +2,26 @@ version: '3.5'

		services:
		mail-postfixadmin:
		container_name: mail-postfixadmin
		restart: on-failure:3
		ports:
		- "${POSTFIXADMIN_PORT}:8888"
		deploy:
		mode: replicated
		replicas: 1
		labels:
		traefik.port: "8888"
		traefik.docker.network: traefik-net
		traefik.frontend.rule: Host:postfixadmin.${PUBLIC_HOSTNAME}
		traefik.backend: postfixadmin
		placement:
		constraints:
		- node.role == manager
		restart_policy:
		condition: on-failure
		delay: 10s
		window: 1m
		resources:
		limits:
		cpus: '0.5'
		memory: 64M
		reservations:
		memory: 52M