From 17cea83301346b7b6c58e710dc1f54bdac12c892 Mon Sep 17 00:00:00 2001 From: Dimitri Huisman Date: Sun, 4 Oct 2020 13:22:59 +0000 Subject: [PATCH] =?UTF-8?q?Completely=20remove=20step=205=20where=20you=20?= =?UTF-8?q?can=20set=20the=20replica=20count=20for=20docker-stack.=20Add?= =?UTF-8?q?=20additional=20warning=20to=20=C2=B4experimental'=20notice=20i?= =?UTF-8?q?n=20setup=20for=20stack.=20Add=20a=20notice=20the=20shipped=20P?= =?UTF-8?q?ostgreSQL=20is=20deprecated.=20Make=20the=20external=20PostgreS?= =?UTF-8?q?QL=20database=20the=20default=20option.=20Make=201.7=20the=20de?= =?UTF-8?q?fault=20version=20(stable=5Fversion':=20'1.7',=20in=20docs\conf?= =?UTF-8?q?.py)=20Update=20mergify.yml=20with=201.8=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .mergify.yml | 6 ++--- docs/conf.py | 2 +- setup/flavors/stack/docker-compose.yml | 8 +++--- setup/templates/steps/config.html | 6 +++-- setup/templates/steps/database.html | 11 +++++--- setup/templates/steps/stack/04_replicas.html | 28 -------------------- 6 files changed, 19 insertions(+), 42 deletions(-) delete mode 100644 setup/templates/steps/stack/04_replicas.html diff --git a/.mergify.yml b/.mergify.yml index f2e5b860..c1141a93 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -35,18 +35,18 @@ pull_request_rules: comment: message: bors r+ - - name: Backport to 1.7 branch + - name: Backport to 1.8 branch conditions: - base=master - label=type/backport actions: backport: branches: - - '1.7' + - '1.8' - name: remove outdated reviews conditions: - - base~=^(master|1.7)$ + - base~=^(master|1.8)$ actions: dismiss_reviews: approved: True diff --git a/docs/conf.py b/docs/conf.py index 24648e88..6b19f967 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -36,7 +36,7 @@ html_context = { 'github_user': 'mailu', 'github_repo': 'mailu', 'github_version': version, - 'stable_version': '1.8', + 'stable_version': '1.7', 'versions': [ ('1.5', '/1.5/'), ('1.6', '/1.6/'), diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml index 3568cfdc..d9c5cd4f 100644 --- a/setup/flavors/stack/docker-compose.yml +++ b/setup/flavors/stack/docker-compose.yml @@ -29,7 +29,7 @@ services: - "{{ root }}/certs:/certs" - "{{ root }}/overrides/nginx:/overrides:ro" deploy: - replicas: {{ front_replicas }} + replicas: 1 admin: image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-{{ version }}} @@ -42,7 +42,7 @@ services: - "{{ root }}/data:/data" - "{{ root }}/dkim:/dkim" deploy: - replicas: {{ admin_replicas }} + replicas: 1 healthcheck: disable: true @@ -53,7 +53,7 @@ services: - "{{ root }}/mail:/mail" - "{{ root }}/overrides/dovecot:/overrides:ro" deploy: - replicas: {{ imap_replicas }} + replicas: 1 healthcheck: disable: true @@ -64,7 +64,7 @@ services: - "{{ root }}/mailqueue:/queue" - "{{ root }}/overrides/postfix:/overrides:ro" deploy: - replicas: {{ smtp_replicas }} + replicas: 1 healthcheck: disable: true diff --git a/setup/templates/steps/config.html b/setup/templates/steps/config.html index d6526eeb..29d8dddd 100644 --- a/setup/templates/steps/config.html +++ b/setup/templates/steps/config.html @@ -1,9 +1,11 @@ {% if flavor == "stack" %} {% call macros.panel("danger", "Docker stack / swarm is experimental") %} Setup is capable of generating a somewhat decent docker-compose.yml, -for the docker stack flavor. However its usage is for advanced users an is experimental. -Expect many challenges is shared mail storage and fail-over scenarios! Some user experiences +for the docker stack flavor. However its usage is for advanced users only and is experimental. +Expect many challenges such as shared mail storage and fail-over scenarios! Some user experiences have been shared on GitHub. +For this reason also think very hard about using a replica count higher than 1. This cannot be used with the default config. +Manual post-configuration is required for using a replica count higher than 1. {% endcall %} {% endif %} diff --git a/setup/templates/steps/database.html b/setup/templates/steps/database.html index af5334cc..194de577 100644 --- a/setup/templates/steps/database.html +++ b/setup/templates/steps/database.html @@ -11,13 +11,16 @@

-{% endcall %} \ No newline at end of file +{% endcall %} diff --git a/setup/templates/steps/stack/04_replicas.html b/setup/templates/steps/stack/04_replicas.html deleted file mode 100644 index 9f6de061..00000000 --- a/setup/templates/steps/stack/04_replicas.html +++ /dev/null @@ -1,28 +0,0 @@ -{% call macros.panel("info", "Step 5 - Number of replicas for containers") %} -

Select number of replicas for containers

- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -{% endcall %}