Harmonization of the various docker-compose.yml

Harmonization (following pr1444) between:
 - docs/compose/docker-compose.yml
 - setup/flavors/stack/docker-compose.yml
 - setup/flavors/compose/docker-compose.yml
Also refresh of the mkdir command found in setup/flavors/stack/setup.html
master
ofthesun9 5 years ago
parent 0469e96f8e
commit 693fb3dbc7

@ -31,7 +31,7 @@ services:
- "$BIND_ADDRESS6:587:587" - "$BIND_ADDRESS6:587:587"
volumes: volumes:
- "$ROOT/certs:/certs" - "$ROOT/certs:/certs"
- "$ROOT/overrides/nginx:/overrides" - "$ROOT/overrides/nginx:/overrides:ro"
redis: redis:
image: redis:alpine image: redis:alpine
@ -45,7 +45,7 @@ services:
env_file: .env env_file: .env
volumes: volumes:
- "$ROOT/mail:/mail" - "$ROOT/mail:/mail"
- "$ROOT/overrides:/overrides" - "$ROOT/overrides/dovecot:/overrides:ro"
depends_on: depends_on:
- front - front
@ -54,7 +54,8 @@ services:
restart: always restart: always
env_file: .env env_file: .env
volumes: volumes:
- "$ROOT/overrides:/overrides" - "$ROOT/mailqueue:/queue"
- "$ROOT/overrides/postfix:/overrides:ro"
depends_on: depends_on:
- front - front
@ -64,8 +65,8 @@ services:
env_file: .env env_file: .env
volumes: volumes:
- "$ROOT/filter:/var/lib/rspamd" - "$ROOT/filter:/var/lib/rspamd"
- "$ROOT/dkim:/dkim" - "$ROOT/dkim:/dkim:ro"
- "$ROOT/overrides/rspamd:/etc/rspamd/override.d" - "$ROOT/overrides/rspamd:/etc/rspamd/override.d:ro"
depends_on: depends_on:
- front - front

@ -27,7 +27,7 @@ services:
{% endfor %} {% endfor %}
volumes: volumes:
- "{{ root }}/certs:/certs" - "{{ root }}/certs:/certs"
- "{{ root }}/overrides/nginx:/overrides" - "{{ root }}/overrides/nginx:/overrides:ro"
deploy: deploy:
replicas: {{ front_replicas }} replicas: {{ front_replicas }}
@ -49,7 +49,7 @@ services:
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/mail:/mail" - "{{ root }}/mail:/mail"
- "{{ root }}/overrides:/overrides" - "{{ root }}/overrides/dovecot:/overrides:ro"
deploy: deploy:
replicas: {{ imap_replicas }} replicas: {{ imap_replicas }}
@ -58,7 +58,7 @@ services:
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/mailqueue:/queue" - "{{ root }}/mailqueue:/queue"
- "{{ root }}/overrides:/overrides" - "{{ root }}/overrides/postfix:/overrides:ro"
deploy: deploy:
replicas: {{ smtp_replicas }} replicas: {{ smtp_replicas }}
@ -67,8 +67,8 @@ services:
env_file: {{ env }} env_file: {{ env }}
volumes: volumes:
- "{{ root }}/filter:/var/lib/rspamd" - "{{ root }}/filter:/var/lib/rspamd"
- "{{ root }}/dkim:/dkim" - "{{ root }}/dkim:/dkim:ro"
- "{{ root }}/overrides/rspamd:/etc/rspamd/override.d" - "{{ root }}/overrides/rspamd:/etc/rspamd/override.d:ro"
deploy: deploy:
replicas: 1 replicas: 1

@ -4,7 +4,7 @@
<p>Docker Stack expects a project file, named <code>docker-compose.yml</code> <p>Docker Stack expects a project file, named <code>docker-compose.yml</code>
in a project directory. First create your project directory.</p> in a project directory. First create your project directory.</p>
<pre><code>mkdir -p /{{ root }}/{redis,certs,data,dkim,mail,overrides/rspamd,overrides/nginx,filter,dav,webmail} <pre><code>mkdir -p {{ root }}/{redis,certs,data,dkim,mail,mailqueue,overrides/rspamd,overrides/postfix,overrides/dovecot,overrides/nginx,filter,dav,webmail}
</pre></code> </pre></code>
<p>Then download the project file. A side configuration file makes it easier <p>Then download the project file. A side configuration file makes it easier

Loading…
Cancel
Save