mirror of
https://github.com/mailcow/mailcow-dockerized.git
synced 2025-02-03 13:22:17 +02:00
🌕🐄 Moone Update 2022 - The Docker Compose v2 Update (Part I)
The next major mailcow release.
This commit is contained in:
Niklas Meyer
GitHub
commit
63f718178e
@ -1,4 +1,4 @@
|
||||
FROM alpine:3.15
|
||||
FROM alpine:3.16
|
||||
|
||||
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM clamav/clamav:0.104.2-2_base
|
||||
FROM clamav/clamav:0.105.0_base
|
||||
|
||||
LABEL maintainer "André Peters <andre.peters@servercow.de>"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM alpine:3.15
|
||||
FROM alpine:3.16
|
||||
|
||||
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM alpine:3.15
|
||||
FROM alpine:3.16
|
||||
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
||||
|
||||
ENV XTABLES_LIBDIR /usr/lib/xtables
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM alpine:3.15
|
||||
FROM alpine:3.16
|
||||
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
FROM php:8.0-fpm-alpine3.14
|
||||
FROM php:8.0-fpm-alpine3.16
|
||||
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
||||
|
||||
ENV APCU_PECL 5.1.20
|
||||
ENV IMAGICK_PECL 3.5.1
|
||||
ENV APCU_PECL 5.1.21
|
||||
ENV IMAGICK_PECL 3.7.0
|
||||
# Mailparse is pulled from master branch
|
||||
#ENV MAILPARSE_PECL 3.0.2
|
||||
ENV MEMCACHED_PECL 3.1.5
|
||||
ENV REDIS_PECL 5.3.4
|
||||
ENV MEMCACHED_PECL 3.2.0
|
||||
ENV REDIS_PECL 5.3.7
|
||||
|
||||
RUN apk add -U --no-cache autoconf \
|
||||
aspell-dev \
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM debian:buster-slim
|
||||
FROM debian:bullseye-slim
|
||||
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
||||
|
||||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@version: 3.19
|
||||
@version: 3.28
|
||||
@include "scl.conf"
|
||||
options {
|
||||
chain_hostnames(off);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@version: 3.19
|
||||
@version: 3.28
|
||||
@include "scl.conf"
|
||||
options {
|
||||
chain_hostnames(off);
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM alpine:3.15
|
||||
FROM alpine:3.16
|
||||
|
||||
LABEL maintainer "Andre Peters <andre.peters@servercow.de>"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
FROM alpine:3.15
|
||||
FROM alpine:3.16
|
||||
LABEL maintainer "André Peters <andre.peters@servercow.de>"
|
||||
|
||||
# Installation
|
||||
|
||||
@ -209,10 +209,17 @@ paths:
|
||||
- app_passwd
|
||||
- add
|
||||
- active: "1"
|
||||
app_name: emclient
|
||||
username: info@domain.tld
|
||||
app_name: wordpress
|
||||
app_passwd: keyleudecticidechothistishownsan31
|
||||
app_passwd2: keyleudecticidechothistishownsan31
|
||||
username: hello@mailcow.email
|
||||
protocols:
|
||||
- imap_access
|
||||
- dav_access
|
||||
- smtp_access
|
||||
- eas_access
|
||||
- pop3_access
|
||||
- sieve_access
|
||||
msg: app_passwd_added
|
||||
type: success
|
||||
schema:
|
||||
@ -249,6 +256,13 @@ paths:
|
||||
app_name: wordpress
|
||||
app_passwd: keyleudecticidechothistishownsan31
|
||||
app_passwd2: keyleudecticidechothistishownsan31
|
||||
protocols:
|
||||
- imap_access
|
||||
- dav_access
|
||||
- smtp_access
|
||||
- eas_access
|
||||
- pop3_access
|
||||
- sieve_access
|
||||
properties:
|
||||
active:
|
||||
description: is alias active or not
|
||||
|
||||
@ -100,6 +100,7 @@ $AVAILABLE_LANGUAGES = array(
|
||||
'ru' => 'Pусский (Russian)',
|
||||
'sk' => 'Slovenčina (Slovak)',
|
||||
'sv' => 'Svenska (Swedish)',
|
||||
'uk' => 'Українська (Ukrainian)',
|
||||
'zh' => '中文 (Chinese)'
|
||||
);
|
||||
|
||||
|
||||
@ -99,37 +99,6 @@ $(document).ready(function() {
|
||||
});
|
||||
auto_fill_quota($('#addSelectDomain').val());
|
||||
|
||||
// Read bcc local dests
|
||||
// Using ajax to not be a blocking moo
|
||||
$.get("/api/v1/get/bcc-destination-options", function(data){
|
||||
// Domains
|
||||
var optgroup = "<optgroup label='" + lang.domains + "'>";
|
||||
$.each(data.domains, function(index, domain){
|
||||
optgroup += "<option value='" + domain + "'>" + domain + "</option>"
|
||||
});
|
||||
optgroup += "</optgroup>"
|
||||
$('#bcc-local-dest').append(optgroup);
|
||||
// Alias domains
|
||||
var optgroup = "<optgroup label='" + lang.domain_aliases + "'>";
|
||||
$.each(data.alias_domains, function(index, alias_domain){
|
||||
optgroup += "<option value='" + alias_domain + "'>" + alias_domain + "</option>"
|
||||
});
|
||||
optgroup += "</optgroup>"
|
||||
$('#bcc-local-dest').append(optgroup);
|
||||
// Mailboxes and aliases
|
||||
$.each(data.mailboxes, function(mailbox, aliases){
|
||||
var optgroup = "<optgroup label='" + mailbox + "'>";
|
||||
$.each(aliases, function(index, alias){
|
||||
optgroup += "<option value='" + alias + "'>" + alias + "</option>"
|
||||
});
|
||||
optgroup += "</optgroup>"
|
||||
$('#bcc-local-dest').append(optgroup);
|
||||
});
|
||||
// Finish
|
||||
$('#bcc-local-dest').find('option:selected').remove();
|
||||
$('#bcc-local-dest').selectpicker('refresh');
|
||||
});
|
||||
|
||||
$(".goto_checkbox").click(function( event ) {
|
||||
$("form[data-id='add_alias'] .goto_checkbox").not(this).prop('checked', false);
|
||||
if ($("form[data-id='add_alias'] .goto_checkbox:checked").length > 0) {
|
||||
@ -584,6 +553,7 @@ jQuery(function($){
|
||||
'</div>';
|
||||
item.chkbox = '<input type="checkbox" data-id="resource" name="multi_select" value="' + encodeURIComponent(item.name) + '" />';
|
||||
item.name = escapeHtml(item.name);
|
||||
item.description = escapeHtml(item.description);
|
||||
});
|
||||
}
|
||||
}),
|
||||
@ -623,6 +593,37 @@ jQuery(function($){
|
||||
});
|
||||
}
|
||||
function draw_bcc_table() {
|
||||
// Read bcc local dests
|
||||
// Using ajax to not be a blocking moo
|
||||
$.get("/api/v1/get/bcc-destination-options", function(data){
|
||||
// Domains
|
||||
var optgroup = "<optgroup label='" + lang.domains + "'>";
|
||||
$.each(data.domains, function(index, domain){
|
||||
optgroup += "<option value='" + domain + "'>" + domain + "</option>"
|
||||
});
|
||||
optgroup += "</optgroup>"
|
||||
$('#bcc-local-dest').append(optgroup);
|
||||
// Alias domains
|
||||
var optgroup = "<optgroup label='" + lang.domain_aliases + "'>";
|
||||
$.each(data.alias_domains, function(index, alias_domain){
|
||||
optgroup += "<option value='" + alias_domain + "'>" + alias_domain + "</option>"
|
||||
});
|
||||
optgroup += "</optgroup>"
|
||||
$('#bcc-local-dest').append(optgroup);
|
||||
// Mailboxes and aliases
|
||||
$.each(data.mailboxes, function(mailbox, aliases){
|
||||
var optgroup = "<optgroup label='" + mailbox + "'>";
|
||||
$.each(aliases, function(index, alias){
|
||||
optgroup += "<option value='" + alias + "'>" + alias + "</option>"
|
||||
});
|
||||
optgroup += "</optgroup>"
|
||||
$('#bcc-local-dest').append(optgroup);
|
||||
});
|
||||
// Finish
|
||||
$('#bcc-local-dest').find('option:selected').remove();
|
||||
$('#bcc-local-dest').selectpicker('refresh');
|
||||
});
|
||||
|
||||
ft_bcc_table = FooTable.init('#bcc_table', {
|
||||
"columns": [
|
||||
{"name":"chkbox","title":"","style":{"min-width":"60px","width":"60px"},"filterable": false,"sortable": false,"type":"html"},
|
||||
@ -1022,7 +1023,7 @@ jQuery(function($){
|
||||
if (!item.exclude > 0) {
|
||||
item.exclude = '-';
|
||||
} else {
|
||||
item.exclude = '<code>' + item.exclude + '</code>';
|
||||
item.exclude = '<code>' + escapeHtml(item.exclude) + '</code>';
|
||||
}
|
||||
item.server_w_port = escapeHtml(item.user1) + '@' + item.host1 + ':' + item.port1;
|
||||
item.action = '<div class="btn-group footable-actions">' +
|
||||
@ -1160,15 +1161,33 @@ jQuery(function($){
|
||||
event.stopPropagation();
|
||||
})
|
||||
|
||||
draw_domain_table();
|
||||
draw_mailbox_table();
|
||||
draw_resource_table();
|
||||
draw_alias_table();
|
||||
draw_aliasdomain_table();
|
||||
draw_sync_job_table();
|
||||
draw_filter_table();
|
||||
draw_bcc_table();
|
||||
draw_recipient_map_table();
|
||||
draw_tls_policy_table();
|
||||
// detect element visibility changes
|
||||
function onVisible(element, callback) {
|
||||
$(element).ready(function() {
|
||||
element_object = document.querySelector(element)
|
||||
new IntersectionObserver((entries, observer) => {
|
||||
entries.forEach(entry => {
|
||||
if(entry.intersectionRatio > 0) {
|
||||
callback(element_object);
|
||||
observer.disconnect();
|
||||
}
|
||||
});
|
||||
}).observe(element_object);
|
||||
});
|
||||
}
|
||||
|
||||
// Load only if the tab is visible
|
||||
onVisible("[id^=tab-domains]", () => draw_domain_table());
|
||||
onVisible("[id^=tab-mailboxes]", () => draw_mailbox_table());
|
||||
onVisible("[id^=tab-resources]", () => draw_resource_table());
|
||||
onVisible("[id^=tab-mbox-aliases]", () => draw_alias_table());
|
||||
onVisible("[id^=tab-domain-aliases]", () => draw_aliasdomain_table());
|
||||
onVisible("[id^=tab-syncjobs]", () => draw_sync_job_table());
|
||||
onVisible("[id^=tab-filters]", () => draw_filter_table());
|
||||
onVisible("[id^=tab-bcc]", () => {
|
||||
draw_bcc_table();
|
||||
draw_recipient_map_table();
|
||||
});
|
||||
onVisible("[id^=tab-tls-policy]", () => draw_tls_policy_table());
|
||||
|
||||
});
|
||||
|
||||
@ -106,7 +106,8 @@
|
||||
"timeout2": "Timeout für Verbindung zum lokalen Host",
|
||||
"username": "Benutzername",
|
||||
"validate": "Validieren",
|
||||
"validation_success": "Erfolgreich validiert"
|
||||
"validation_success": "Erfolgreich validiert",
|
||||
"tags": "Tags"
|
||||
},
|
||||
"admin": {
|
||||
"access": "Zugang",
|
||||
|
||||
@ -2,8 +2,8 @@
|
||||
"acl": {
|
||||
"alias_domains": "Aggiungi alias di dominio",
|
||||
"app_passwds": "Gestisci le password delle app",
|
||||
"bcc_maps": "BCC maps",
|
||||
"delimiter_action": "Delimiter action",
|
||||
"bcc_maps": "Mappe CCN",
|
||||
"delimiter_action": "Azione delimitatrice",
|
||||
"domain_desc": "Modifica la descrizione del dominio",
|
||||
"domain_relayhost": "Modifica relayhost per un dominio",
|
||||
"eas_reset": "Ripristina i dispositivi EAS",
|
||||
@ -106,7 +106,8 @@
|
||||
"validate": "Convalida",
|
||||
"validation_success": "Convalidato con successo",
|
||||
"bcc_dest_format": "Il destinatario in copia nascosta deve essere un singolo indirizzo email.<br>Se si vuole spedire una copia del messaggio a più destinatari, bisogna creare un alias ed utilizzarlo per questa opzione.",
|
||||
"app_passwd_protocols": "Protocolli consentiti per la password dell'app"
|
||||
"app_passwd_protocols": "Protocolli consentiti per la password dell'app",
|
||||
"tags": "Tag"
|
||||
},
|
||||
"admin": {
|
||||
"access": "Accedi",
|
||||
@ -983,7 +984,7 @@
|
||||
"enter_qr_code": "Il codice TOTP se il tuo dispositivo non è in grado di acquisire i codici QR",
|
||||
"error_code": "Codice di errore",
|
||||
"init_webauthn": "Inizializzazione, attendere prego...",
|
||||
"key_id": "Identificatore per il tuo YubiKey",
|
||||
"key_id": "Identificatore per il tuo dispositivo",
|
||||
"key_id_totp": "Identificatore per la tua chiave",
|
||||
"none": "Disattivato",
|
||||
"reload_retry": "- (ricaricare la pagina se l'errore persiste)",
|
||||
@ -997,7 +998,9 @@
|
||||
"waiting_usb_auth": "<i>In attesa del device USB...</i><br /><br />Tocca ora il pulsante sul dispositivo WebAuthn USB.",
|
||||
"waiting_usb_register": "<i>In attesa del device USB...</i><br /><br />Inserisci la tua password qui sopra e conferma la tua registrazione WebAuthn toccando il pulsante del dispositivo WebAuthn USB.",
|
||||
"yubi_otp": "Autenticazione Yubico OTP",
|
||||
"tfa_token_invalid": "Token TFA non valido"
|
||||
"tfa_token_invalid": "Token TFA non valido",
|
||||
"u2f_deprecated": "Sembra che la tua chiave sia stata registrata utilizzando il metodo U2F deprecato. Disattiveremo Two-Factor-Authenticaiton per te e cancelleremo la tua chiave.",
|
||||
"u2f_deprecated_important": "Registra la tua chiave nel pannello di amministrazione con il nuovo metodo WebAuthn."
|
||||
},
|
||||
"user": {
|
||||
"action": "Azione",
|
||||
|
||||
@ -105,7 +105,9 @@
|
||||
"timeout2": "Тайм-аут для подключения к локальному хосту",
|
||||
"username": "Имя пользователя",
|
||||
"validate": "Проверить",
|
||||
"validation_success": "Проверка прошла успешно"
|
||||
"validation_success": "Проверка прошла успешно",
|
||||
"tags": "Теги",
|
||||
"app_passwd_protocols": "Разрешенные протоколы для пароля приложения"
|
||||
},
|
||||
"admin": {
|
||||
"access": "Настройки доступа",
|
||||
@ -190,7 +192,7 @@
|
||||
"flush_queue": "Отправить все сообщения",
|
||||
"forwarding_hosts": "Переадресация хостов",
|
||||
"forwarding_hosts_add_hint": "Можно указывать: IPv4/IPv6 подсети в нотации CIDR, имена хостов (которые будут разрешаться в IP-адреса) или доменные имена (которые будут решаться с IP-адресами путем запроса SPF записей или, в случае их отсутствия - запросом MX записей).",
|
||||
"forwarding_hosts_hint": "Входящие сообщения безоговорочно принимаются от любых хостов, перечисленных здесь. Эти хосты не проходят проверку DNSBL и graylisting. Спам, полученный от них, никогда не отклоняется, но при желании можно включить спам фильтр и письма с плохим рейтингом будут попадать в Junk. Наиболее распространенное использование - указать почтовые серверы, на которых вы установили правило, которое перенаправляет входящие электронные письма на ваш почтовый сервер.",
|
||||
"forwarding_hosts_hint": "Входящие сообщения безоговорочно принимаются от любых хостов, перечисленных здесь. Эти хосты не проходят проверку DNSBL и graylisting. Спам, полученный от них, никогда не отклоняется, но при желании можно включить спам фильтр и письма с плохим рейтингом будут попадать в Junk. Наиболее распространенное использование - указать почтовые серверы, на которых вы установили правило, которое перенаправляет входящие электронные письма на ваш почтовый сервер mailcow.",
|
||||
"from": "От",
|
||||
"generate": "сгенерировать",
|
||||
"guid": "GUID - уникальный ID",
|
||||
@ -460,7 +462,8 @@
|
||||
"unlimited_quota_acl": "Неограниченная квота запрещена политикой доступа",
|
||||
"username_invalid": "Имя пользователя %s нельзя использовать",
|
||||
"validity_missing": "Пожалуйста, назначьте срок действия",
|
||||
"value_missing": "Пожалуйста заполните все поля"
|
||||
"value_missing": "Пожалуйста заполните все поля",
|
||||
"yotp_verification_failed": "Ошибка валидации Yubico OTP: %s"
|
||||
},
|
||||
"debug": {
|
||||
"chart_this_server": "Диаграмма (текущий сервер)",
|
||||
@ -886,11 +889,11 @@
|
||||
"type": "Тип"
|
||||
},
|
||||
"ratelimit": {
|
||||
"disabled": "Отключен",
|
||||
"second": "сообщений / секунду",
|
||||
"minute": "сообщений / минуту",
|
||||
"hour": "сообщений / час",
|
||||
"day": "сообщений / день"
|
||||
"disabled": "Отключен",
|
||||
"second": "сообщений / секунду",
|
||||
"minute": "сообщений / минуту",
|
||||
"hour": "сообщений / час",
|
||||
"day": "сообщений / день"
|
||||
},
|
||||
"start": {
|
||||
"help": "Справка",
|
||||
|
||||
1186
data/web/lang/lang.uk.json
Normal file
1186
data/web/lang/lang.uk.json
Normal file
File diff suppressed because it is too large
Load Diff
@ -2,11 +2,14 @@
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">{{ lang.user.mailbox_general }}</div>
|
||||
<div class="panel-body">
|
||||
{% if mailboxdata.attributes.force_pw_update == '1' %}
|
||||
<div class="alert alert-danger">{{ lang.user.force_pw_update|raw }}</div>
|
||||
{% endif %}
|
||||
{% if not skip_sogo %}
|
||||
<div class="row">
|
||||
<div class="hidden-xs col-md-3 col-xs-5 text-right"></div>
|
||||
<div class="col-md-3 col-xs-12">
|
||||
{% if dual_login and allow_admin_email_login == 'n' %}
|
||||
{% if dual_login and allow_admin_email_login == 'n' or mailboxdata.attributes.force_pw_update == '1' %}
|
||||
<button disabled class="btn btn-default btn-block btn-xs-lg">
|
||||
<i class="bi bi-inbox-fill"></i> {{ lang.user.open_webmail_sso }}
|
||||
</button>
|
||||
@ -115,9 +118,6 @@
|
||||
<hr>
|
||||
<div class="row">
|
||||
<div class="col-sm-offset-3 col-sm-9">
|
||||
{% if mailboxdata.attributes.force_pw_update == '1' %}
|
||||
<div class="alert alert-danger">{{ lang.user.force_pw_update|raw }}</div>
|
||||
{% endif %}
|
||||
<p><a target="_blank" href="https://mailcow.github.io/mailcow-dockerized-docs/client/client/#{{ clientconfigstr }}">[{{ lang.user.client_configuration }}]</a></p>
|
||||
<p><a href="#userFilterModal" data-toggle="modal">[{{ lang.user.show_sieve_filters }}]</a></p>
|
||||
<hr>
|
||||
|
||||
@ -2,7 +2,7 @@ version: '2.1'
|
||||
services:
|
||||
|
||||
unbound-mailcow:
|
||||
image: mailcow/unbound:1.15
|
||||
image: mailcow/unbound:1.16
|
||||
environment:
|
||||
- TZ=${TZ}
|
||||
volumes:
|
||||
@ -22,8 +22,8 @@ services:
|
||||
- unbound-mailcow
|
||||
stop_grace_period: 45s
|
||||
volumes:
|
||||
- mysql-vol-1:/var/lib/mysql/:Z
|
||||
- mysql-socket-vol-1:/var/run/mysqld/:z
|
||||
- mysql-vol-1:/var/lib/mysql/
|
||||
- mysql-socket-vol-1:/var/run/mysqld/
|
||||
- ./data/conf/mysql/:/etc/mysql/conf.d/:ro,Z
|
||||
environment:
|
||||
- TZ=${TZ}
|
||||
@ -43,7 +43,7 @@ services:
|
||||
redis-mailcow:
|
||||
image: redis:6-alpine
|
||||
volumes:
|
||||
- redis-vol-1:/data/:Z
|
||||
- redis-vol-1:/data/
|
||||
restart: always
|
||||
ports:
|
||||
- "${REDIS_PORT:-127.0.0.1:7654}:6379"
|
||||
@ -58,8 +58,10 @@ services:
|
||||
- redis
|
||||
|
||||
clamd-mailcow:
|
||||
image: mailcow/clamd:1.51
|
||||
image: mailcow/clamd:1.52
|
||||
restart: always
|
||||
depends_on:
|
||||
- unbound-mailcow
|
||||
dns:
|
||||
- ${IPV4_NETWORK:-172.22.1}.254
|
||||
environment:
|
||||
@ -67,7 +69,7 @@ services:
|
||||
- SKIP_CLAMD=${SKIP_CLAMD:-n}
|
||||
volumes:
|
||||
- ./data/conf/clamav/:/etc/clamav/:Z
|
||||
- clamd-db-vol-1:/var/lib/clamav:z
|
||||
- clamd-db-vol-1:/var/lib/clamav
|
||||
networks:
|
||||
mailcow-network:
|
||||
aliases:
|
||||
@ -93,7 +95,7 @@ services:
|
||||
- ./data/conf/rspamd/lua/:/etc/rspamd/lua/:ro,Z
|
||||
- ./data/conf/rspamd/rspamd.conf.local:/etc/rspamd/rspamd.conf.local:Z
|
||||
- ./data/conf/rspamd/rspamd.conf.override:/etc/rspamd/rspamd.conf.override:Z
|
||||
- rspamd-vol-1:/var/lib/rspamd:z
|
||||
- rspamd-vol-1:/var/lib/rspamd
|
||||
restart: always
|
||||
hostname: rspamd
|
||||
dns:
|
||||
@ -104,7 +106,7 @@ services:
|
||||
- rspamd
|
||||
|
||||
php-fpm-mailcow:
|
||||
image: mailcow/phpfpm:1.78
|
||||
image: mailcow/phpfpm:1.79
|
||||
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
|
||||
depends_on:
|
||||
- redis-mailcow
|
||||
@ -113,8 +115,8 @@ services:
|
||||
- ./data/web:/web:z
|
||||
- ./data/conf/rspamd/dynmaps:/dynmaps:ro,z
|
||||
- ./data/conf/rspamd/custom/:/rspamd_custom_maps:z
|
||||
- rspamd-vol-1:/var/lib/rspamd:z
|
||||
- mysql-socket-vol-1:/var/run/mysqld/:z
|
||||
- rspamd-vol-1:/var/lib/rspamd
|
||||
- mysql-socket-vol-1:/var/run/mysqld/
|
||||
- ./data/conf/sogo/:/etc/sogo/:z
|
||||
- ./data/conf/rspamd/meta_exporter:/meta_exporter:ro,z
|
||||
- ./data/conf/phpfpm/sogo-sso/:/etc/sogo-sso/:z
|
||||
@ -192,9 +194,9 @@ services:
|
||||
- ./data/conf/sogo/custom-favicon.ico:/usr/lib/GNUstep/SOGo/WebServerResources/img/sogo.ico:z
|
||||
- ./data/conf/sogo/custom-theme.js:/usr/lib/GNUstep/SOGo/WebServerResources/js/theme.js:z
|
||||
- ./data/conf/sogo/custom-sogo.js:/usr/lib/GNUstep/SOGo/WebServerResources/js/custom-sogo.js:z
|
||||
- mysql-socket-vol-1:/var/run/mysqld/:z
|
||||
- sogo-web-vol-1:/sogo_web:z
|
||||
- sogo-userdata-backup-vol-1:/sogo_backup:Z
|
||||
- mysql-socket-vol-1:/var/run/mysqld/
|
||||
- sogo-web-vol-1:/sogo_web
|
||||
- sogo-userdata-backup-vol-1:/sogo_backup
|
||||
labels:
|
||||
ofelia.enabled: "true"
|
||||
ofelia.job-exec.sogo_sessions.schedule: "@every 1m"
|
||||
@ -226,13 +228,13 @@ services:
|
||||
- ./data/assets/ssl:/etc/ssl/mail/:ro,z
|
||||
- ./data/conf/sogo/:/etc/sogo/:z
|
||||
- ./data/conf/phpfpm/sogo-sso/:/etc/phpfpm/:z
|
||||
- vmail-vol-1:/var/vmail:Z
|
||||
- vmail-index-vol-1:/var/vmail_index:Z
|
||||
- crypt-vol-1:/mail_crypt/:z
|
||||
- vmail-vol-1:/var/vmail
|
||||
- vmail-index-vol-1:/var/vmail_index
|
||||
- crypt-vol-1:/mail_crypt/
|
||||
- ./data/conf/rspamd/custom/:/etc/rspamd/custom:z
|
||||
- ./data/assets/templates:/templates:z
|
||||
- rspamd-vol-1:/var/lib/rspamd:z
|
||||
- mysql-socket-vol-1:/var/run/mysqld/:z
|
||||
- rspamd-vol-1:/var/lib/rspamd
|
||||
- mysql-socket-vol-1:/var/run/mysqld/
|
||||
environment:
|
||||
- DOVECOT_MASTER_USER=${DOVECOT_MASTER_USER:-}
|
||||
- DOVECOT_MASTER_PASS=${DOVECOT_MASTER_PASS:-}
|
||||
@ -293,17 +295,17 @@ services:
|
||||
- dovecot
|
||||
|
||||
postfix-mailcow:
|
||||
image: mailcow/postfix:1.66
|
||||
image: mailcow/postfix:1.67
|
||||
depends_on:
|
||||
- mysql-mailcow
|
||||
volumes:
|
||||
- ./data/hooks/postfix:/hooks:Z
|
||||
- ./data/conf/postfix:/opt/postfix/conf:z
|
||||
- ./data/assets/ssl:/etc/ssl/mail/:ro,z
|
||||
- postfix-vol-1:/var/spool/postfix:z
|
||||
- crypt-vol-1:/var/lib/zeyple:z
|
||||
- rspamd-vol-1:/var/lib/rspamd:z
|
||||
- mysql-socket-vol-1:/var/run/mysqld/:z
|
||||
- postfix-vol-1:/var/spool/postfix
|
||||
- crypt-vol-1:/var/lib/zeyple
|
||||
- rspamd-vol-1:/var/lib/rspamd
|
||||
- mysql-socket-vol-1:/var/run/mysqld/
|
||||
environment:
|
||||
- LOG_LINES=${LOG_LINES:-9999}
|
||||
- TZ=${TZ}
|
||||
@ -373,10 +375,10 @@ services:
|
||||
- ./data/assets/ssl/:/etc/ssl/mail/:ro,z
|
||||
- ./data/conf/nginx/:/etc/nginx/conf.d/:z
|
||||
- ./data/conf/rspamd/meta_exporter:/meta_exporter:ro,z
|
||||
- sogo-web-vol-1:/usr/lib/GNUstep/SOGo/:z
|
||||
- sogo-web-vol-1:/usr/lib/GNUstep/SOGo/
|
||||
ports:
|
||||
- "${HTTPS_BIND:-:}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
|
||||
- "${HTTP_BIND:-:}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"
|
||||
- "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
|
||||
- "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"
|
||||
restart: always
|
||||
networks:
|
||||
mailcow-network:
|
||||
@ -386,7 +388,7 @@ services:
|
||||
acme-mailcow:
|
||||
depends_on:
|
||||
- nginx-mailcow
|
||||
image: mailcow/acme:1.81
|
||||
image: mailcow/acme:1.82
|
||||
dns:
|
||||
- ${IPV4_NETWORK:-172.22.1}.254
|
||||
environment:
|
||||
@ -414,7 +416,7 @@ services:
|
||||
- ./data/web/.well-known/acme-challenge:/var/www/acme:z
|
||||
- ./data/assets/ssl:/var/lib/acme/:z
|
||||
- ./data/assets/ssl-example:/var/lib/ssl-example/:ro,Z
|
||||
- mysql-socket-vol-1:/var/run/mysqld/:z
|
||||
- mysql-socket-vol-1:/var/run/mysqld/
|
||||
restart: always
|
||||
networks:
|
||||
mailcow-network:
|
||||
@ -422,7 +424,7 @@ services:
|
||||
- acme
|
||||
|
||||
netfilter-mailcow:
|
||||
image: mailcow/netfilter:1.47
|
||||
image: mailcow/netfilter:1.48
|
||||
stop_grace_period: 30s
|
||||
depends_on:
|
||||
- dovecot-mailcow
|
||||
@ -445,15 +447,15 @@ services:
|
||||
- /lib/modules:/lib/modules:ro
|
||||
|
||||
watchdog-mailcow:
|
||||
image: mailcow/watchdog:1.96
|
||||
image: mailcow/watchdog:1.97
|
||||
dns:
|
||||
- ${IPV4_NETWORK:-172.22.1}.254
|
||||
tmpfs:
|
||||
- /tmp
|
||||
volumes:
|
||||
- rspamd-vol-1:/var/lib/rspamd:z
|
||||
- mysql-socket-vol-1:/var/run/mysqld/:z
|
||||
- postfix-vol-1:/var/spool/postfix:z
|
||||
- rspamd-vol-1:/var/lib/rspamd
|
||||
- mysql-socket-vol-1:/var/run/mysqld/
|
||||
- postfix-vol-1:/var/spool/postfix
|
||||
- ./data/assets/ssl:/etc/ssl/mail/:ro,z
|
||||
restart: always
|
||||
environment:
|
||||
@ -507,7 +509,7 @@ services:
|
||||
- watchdog
|
||||
|
||||
dockerapi-mailcow:
|
||||
image: mailcow/dockerapi:1.41
|
||||
image: mailcow/dockerapi:1.42
|
||||
security_opt:
|
||||
- label=disable
|
||||
restart: always
|
||||
@ -528,7 +530,7 @@ services:
|
||||
image: mailcow/solr:1.8.1
|
||||
restart: always
|
||||
volumes:
|
||||
- solr-vol-1:/opt/solr/server/solr/dovecot-fts/data:Z
|
||||
- solr-vol-1:/opt/solr/server/solr/dovecot-fts/data
|
||||
ports:
|
||||
- "${SOLR_PORT:-127.0.0.1:18983}:8983"
|
||||
environment:
|
||||
@ -541,7 +543,7 @@ services:
|
||||
- solr
|
||||
|
||||
olefy-mailcow:
|
||||
image: mailcow/olefy:1.9
|
||||
image: mailcow/olefy:1.10
|
||||
restart: always
|
||||
environment:
|
||||
- TZ=${TZ}
|
||||
|
||||
@ -25,10 +25,26 @@ if cp --help 2>&1 | grep -q -i "busybox"; then
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for bin in openssl curl docker-compose docker git awk sha1sum; do
|
||||
for bin in openssl curl docker git awk sha1sum; do
|
||||
if [[ -z $(which ${bin}) ]]; then echo "Cannot find ${bin}, exiting..."; exit 1; fi
|
||||
done
|
||||
|
||||
echo "checking docker compose version...";
|
||||
if docker compose >/dev/null 2>&1; then
|
||||
echo -e "\e[32mFound Compose v2!\e[0m"
|
||||
elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then
|
||||
echo -e "\e[33mWARN: Your machine is using Docker-Compose v1!\e[0m"
|
||||
echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"
|
||||
echo -e "\e[33mPlease consider a upgrade to Docker-Compose v2.\e[0m"
|
||||
echo
|
||||
echo
|
||||
echo -e "\e[33mContinuing...\e[0m"
|
||||
sleep 3
|
||||
else
|
||||
echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ -f mailcow.conf ]; then
|
||||
read -r -p "A config file exists and will be overwritten, are you sure you want to continue? [y/N] " response
|
||||
case $response in
|
||||
@ -144,7 +160,7 @@ DBROOT=$(LC_ALL=C </dev/urandom tr -dc A-Za-z0-9 | head -c 28)
|
||||
# Do _not_ use IP:PORT in HTTP(S)_BIND or HTTP(S)_PORT
|
||||
# IMPORTANT: Do not use port 8081, 9081 or 65510!
|
||||
# Example: HTTP_BIND=1.2.3.4
|
||||
# For IPv4 and IPv6 leave it empty: HTTP_BIND= & HTTPS_PORT=
|
||||
# For IPv4 leave it as it is: HTTP_BIND= & HTTPS_PORT=
|
||||
# For IPv6 see https://mailcow.github.io/mailcow-dockerized-docs/post_installation/firststeps-ip_bindings/
|
||||
|
||||
HTTP_PORT=80
|
||||
|
||||
@ -77,15 +77,32 @@ function preflight_local_checks() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for bin in rsync docker-compose docker grep cut; do
|
||||
for bin in rsync docker grep cut; do
|
||||
if [[ -z $(which ${bin}) ]]; then
|
||||
>&2 echo -e "\e[31mCannot find ${bin} in local PATH, exiting...\e[0m"
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
|
||||
echo "checking docker compose version...";
|
||||
if docker compose >/dev/null 2>&1; then
|
||||
echo -e "\e[32mFound Compose v2 on local machine!\e[0m"
|
||||
elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then
|
||||
echo -e "\e[33mWARN: Your machine is using Docker-Compose v1!\e[0m"
|
||||
echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"
|
||||
echo -e "\e[33mPlease consider a upgrade to Docker-Compose v2.\e[0m"
|
||||
echo
|
||||
echo
|
||||
echo -e "\e[33mContinuing...\e[0m"
|
||||
sleep 3
|
||||
else
|
||||
echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if grep --help 2>&1 | head -n 1 | grep -q -i "busybox"; then
|
||||
>&2 echo -e "\e[31mBusyBox grep detected on local system, please install GNU grep\e[0m"
|
||||
echo -e "\e[31mBusyBox grep detected on local system, please install GNU grep\e[0m"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
@ -111,7 +128,7 @@ function preflight_remote_checks() {
|
||||
exit 1
|
||||
fi
|
||||
|
||||
for bin in rsync docker-compose docker; do
|
||||
for bin in rsync docker; do
|
||||
if ! ssh -o StrictHostKeyChecking=no \
|
||||
-i "${REMOTE_SSH_KEY}" \
|
||||
${REMOTE_SSH_HOST} \
|
||||
@ -122,6 +139,31 @@ function preflight_remote_checks() {
|
||||
fi
|
||||
done
|
||||
|
||||
echo "checking docker compose version on remote...";
|
||||
if ssh -q -o StrictHostKeyChecking=no \
|
||||
-i "${REMOTE_SSH_KEY}" \
|
||||
${REMOTE_SSH_HOST} \
|
||||
-p ${REMOTE_SSH_PORT} \
|
||||
-t 'docker compose' >/dev/null 2>&1; then
|
||||
echo -e "\e[32mFound Compose v2 on remote!\e[0m"
|
||||
COMPOSE_COMMAND="docker compose"
|
||||
elif ssh -q -o StrictHostKeyChecking=no \
|
||||
-i "${REMOTE_SSH_KEY}" \
|
||||
${REMOTE_SSH_HOST} \
|
||||
-p ${REMOTE_SSH_PORT} \
|
||||
-t 'docker-compose version --short' | grep -m1 "^1" > /dev/null 2>&1; then
|
||||
echo -e "\e[33mWARN: The remote is using Docker-Compose v1!\e[0m"
|
||||
echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"
|
||||
echo -e "\e[33mPlease consider a upgrade to Docker-Compose v2 on remote.\e[0m"
|
||||
echo
|
||||
echo
|
||||
echo -e "\e[33mContinuing...\e[0m"
|
||||
sleep 3
|
||||
COMPOSE_COMMAND="docker-compose"
|
||||
else
|
||||
echo -e "\e[31mCannot find Docker-Compose v1 or v2 on the Remote Machine! Please install Docker-Compose v2 on that and re-run the script.\e[0m"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
preflight_local_checks
|
||||
@ -252,16 +294,18 @@ if ! ssh -o StrictHostKeyChecking=no \
|
||||
fi
|
||||
echo "OK"
|
||||
|
||||
echo -e "\033[1mPulling images on remote...\033[0m"
|
||||
if ! ssh -o StrictHostKeyChecking=no \
|
||||
-i "${REMOTE_SSH_KEY}" \
|
||||
${REMOTE_SSH_HOST} \
|
||||
-p ${REMOTE_SSH_PORT} \
|
||||
docker-compose -f "${SCRIPT_DIR}/../docker-compose.yml" pull --no-parallel 2>&1 ; then
|
||||
>&2 echo -e "\e[31m[ERR]\e[0m - Could not pull images on remote"
|
||||
fi
|
||||
echo -e "\e[33mPulling images on remote...\e[0m"
|
||||
echo -e "\e[33mProcess is NOT stuck! Please wait...\e[0m"
|
||||
|
||||
echo -e "\033[1mForcing garbage cleanup on remote...\033[0m"
|
||||
if ! ssh -o StrictHostKeyChecking=no \
|
||||
-i "${REMOTE_SSH_KEY}" \
|
||||
${REMOTE_SSH_HOST} \
|
||||
-p ${REMOTE_SSH_PORT} \
|
||||
$COMPOSE_COMMAND -f "${SCRIPT_DIR}/../docker-compose.yml" pull --no-parallel --quiet 2>&1 ; then
|
||||
>&2 echo -e "\e[31m[ERR]\e[0m - Could not pull images on remote"
|
||||
fi
|
||||
|
||||
echo -e "\033[1mExecuting update script and forcing garbage cleanup on remote...\033[0m"
|
||||
if ! ssh -o StrictHostKeyChecking=no \
|
||||
-i "${REMOTE_SSH_KEY}" \
|
||||
${REMOTE_SSH_HOST} \
|
||||
|
||||
@ -76,6 +76,30 @@ else
|
||||
CMPS_PRJ=$(echo ${COMPOSE_PROJECT_NAME} | tr -cd "[0-9A-Za-z-_]")
|
||||
fi
|
||||
|
||||
echo "checking docker compose version...";
|
||||
if docker compose >/dev/null 2>&1; then
|
||||
echo -e "\e[32mFound Compose v2!\e[0m"
|
||||
COMPOSE_COMMAND="docker compose"
|
||||
elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then
|
||||
echo -e "\e[33mWARN: Your machine is using Docker-Compose v1!\e[0m"
|
||||
echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"
|
||||
echo -e "\e[33mPlease consider a upgrade to Docker-Compose v2.\e[0m"
|
||||
echo
|
||||
echo
|
||||
echo -e "\e[33mContinuing...\e[0m"
|
||||
sleep 3
|
||||
COMPOSE_COMMAND="docker-compose"
|
||||
else
|
||||
echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if grep --help 2>&1 | head -n 1 | grep -q -i "busybox"; then
|
||||
>&2 echo -e "\e[31mBusyBox grep detected on local system, please install GNU grep\e[0m"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
function backup() {
|
||||
DATE=$(date +"%Y-%m-%d-%H-%M-%S")
|
||||
mkdir -p "${BACKUP_LOCATION}/mailcow-${DATE}"
|
||||
@ -226,7 +250,7 @@ function restore() {
|
||||
continue
|
||||
else
|
||||
echo "Stopping mailcow..."
|
||||
docker-compose -f ${COMPOSE_FILE} --env-file ${ENV_FILE} down
|
||||
${COMPOSE_COMMAND} -f ${COMPOSE_FILE} --env-file ${ENV_FILE} down
|
||||
fi
|
||||
#docker stop $(docker ps -qf name=mysql-mailcow)
|
||||
if [[ -d "${RESTORE_LOCATION}/mysql" ]]; then
|
||||
@ -264,7 +288,7 @@ function restore() {
|
||||
sed -i --follow-symlinks "/DBROOT/c\DBROOT=${DBROOT}" ${SCRIPT_DIR}/../mailcow.conf
|
||||
source ${SCRIPT_DIR}/../mailcow.conf
|
||||
echo "Starting mailcow..."
|
||||
docker-compose -f ${COMPOSE_FILE} --env-file ${ENV_FILE} up -d
|
||||
${COMPOSE_COMMAND} -f ${COMPOSE_FILE} --env-file ${ENV_FILE} up -d
|
||||
#docker start $(docker ps -aqf name=mysql-mailcow)
|
||||
fi
|
||||
;;
|
||||
|
||||
86
update.sh
86
update.sh
@ -40,10 +40,28 @@ PATH=$PATH:/opt/bin
|
||||
|
||||
umask 0022
|
||||
|
||||
for bin in curl docker-compose docker git awk sha1sum; do
|
||||
for bin in curl docker git awk sha1sum; do
|
||||
if [[ -z $(which ${bin}) ]]; then echo "Cannot find ${bin}, exiting..."; exit 1; fi
|
||||
done
|
||||
|
||||
|
||||
echo "checking docker compose version...";
|
||||
if docker compose >/dev/null 2>&1; then
|
||||
echo -e "\e[32mFound Compose v2!\e[0m"
|
||||
COMPOSE_COMMAND="docker compose"
|
||||
elif docker-compose version --short | grep -m1 "^1" > /dev/null 2>&1; then
|
||||
echo -e "\e[33mWARN: Your machine is using Docker-Compose v1!\e[0m"
|
||||
echo -e "\e[33mmailcow will drop the Docker-Compose v1 Support in December 2022\e[0m"
|
||||
echo -e "\e[33mPlease consider a upgrade to Docker-Compose v2.\e[0m"
|
||||
echo
|
||||
echo
|
||||
echo -e "\e[33mContinuing...\e[0m"
|
||||
sleep 3
|
||||
COMPOSE_COMMAND="docker-compose"
|
||||
else
|
||||
echo -e "\e[31mCannot find Docker-Compose v1 or v2 on your System. Please install Docker-Compose v2 and re-run the Script.\e[0m"
|
||||
exit 1
|
||||
fi
|
||||
export LC_ALL=C
|
||||
DATE=$(date +%Y-%m-%d_%H_%M_%S)
|
||||
BRANCH=$(cd ${SCRIPT_DIR}; git rev-parse --abbrev-ref HEAD)
|
||||
@ -235,9 +253,6 @@ while (($#)); do
|
||||
echo -e "\e[32mRunning in forced mode...\e[0m"
|
||||
FORCE=y
|
||||
;;
|
||||
--no-update-compose)
|
||||
NO_UPDATE_COMPOSE=y
|
||||
;;
|
||||
--skip-ping-check)
|
||||
SKIP_PING_CHECK=y
|
||||
;;
|
||||
@ -247,7 +262,6 @@ while (($#)); do
|
||||
-c|--check - Check for updates and exit (exit codes => 0: update available, 3: no updates)
|
||||
--ours - Use merge strategy option "ours" to solve conflicts in favor of non-mailcow code (local changes over remote changes), not recommended!
|
||||
--gc - Run garbage collector to delete old image tags
|
||||
--no-update-compose - Do not update docker-compose
|
||||
--prefetch - Only prefetch new images and exit (useful to prepare updates)
|
||||
--skip-start - Do not start mailcow after update
|
||||
--skip-ping-check - Skip ICMP Check to public DNS resolvers (Use it only if you´ve blocked any ICMP Connections to your mailcow machine).
|
||||
@ -264,7 +278,7 @@ source mailcow.conf
|
||||
DOTS=${MAILCOW_HOSTNAME//[^.]};
|
||||
if [ ${#DOTS} -lt 2 ]; then
|
||||
echo "MAILCOW_HOSTNAME (${MAILCOW_HOSTNAME}) is not a FQDN!"
|
||||
echo "Please change it to a FQDN and run docker-compose down followed by docker-compose up -d"
|
||||
echo "Please change it to a FQDN and run ${COMPOSE_COMMAND} down followed by ${COMPOSE_COMMAND} up -d"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@ -578,13 +592,13 @@ if [ ! $FORCE ]; then
|
||||
fi
|
||||
|
||||
echo -e "\e[32mValidating docker-compose stack configuration...\e[0m"
|
||||
if ! docker-compose config -q; then
|
||||
if ! ${COMPOSE_COMMAND} config -q; then
|
||||
echo -e "\e[31m\nOh no, something went wrong. Please check the error message above.\e[0m"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo -e "\e[32mChecking for conflicting bridges...\e[0m"
|
||||
MAILCOW_BRIDGE=$(docker-compose config | grep -i com.docker.network.bridge.name | cut -d':' -f2)
|
||||
MAILCOW_BRIDGE=$(${COMPOSE_COMMAND} config | grep -i com.docker.network.bridge.name | cut -d':' -f2)
|
||||
while read NAT_ID; do
|
||||
iptables -t nat -D POSTROUTING $NAT_ID
|
||||
done < <(iptables -L -vn -t nat --line-numbers | grep $IPV4_NETWORK | grep -E 'MASQUERADE.*all' | grep -v ${MAILCOW_BRIDGE} | cut -d' ' -f1)
|
||||
@ -604,8 +618,8 @@ prefetch_images
|
||||
|
||||
echo -e "\e[32mStopping mailcow...\e[0m"
|
||||
sleep 2
|
||||
MAILCOW_CONTAINERS=($(docker-compose ps -q))
|
||||
docker-compose down
|
||||
MAILCOW_CONTAINERS=($(${COMPOSE_COMMAND} ps -q))
|
||||
${COMPOSE_COMMAND} down
|
||||
echo -e "\e[32mChecking for remaining containers...\e[0m"
|
||||
sleep 2
|
||||
for container in "${MAILCOW_CONTAINERS[@]}"; do
|
||||
@ -642,51 +656,16 @@ elif [[ ${MERGE_RETURN} == 1 ]]; then
|
||||
elif [[ ${MERGE_RETURN} != 0 ]]; then
|
||||
echo -e "\e[31m\nOh no, something went wrong. Please check the error message above.\e[0m"
|
||||
echo
|
||||
echo "Run docker-compose up -d to restart your stack without updates or try again after fixing the mentioned errors."
|
||||
echo "Run ${COMPOSE_COMMAND} up -d to restart your stack without updates or try again after fixing the mentioned errors."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [[ ${NO_UPDATE_COMPOSE} == "y" ]]; then
|
||||
echo -e "\e[33mNot fetching latest docker-compose, please check for updates manually!\e[0m"
|
||||
elif [[ -e /etc/alpine-release ]]; then
|
||||
echo -e "\e[33mNot fetching latest docker-compose, because you are using Alpine Linux without glibc support. Please update docker-compose via apk!\e[0m"
|
||||
else
|
||||
echo -e "\e[32mFetching new docker-compose version...\e[0m"
|
||||
echo -e "\e[32mTrying to determine GLIBC version...\e[0m"
|
||||
if ldd --version > /dev/null; then
|
||||
GLIBC_V=$(ldd --version | grep -E '(GLIBC|GNU libc)' | rev | cut -d ' ' -f1 | rev | cut -d '.' -f2)
|
||||
if [ ! -z "${GLIBC_V}" ] && [ ${GLIBC_V} -gt 27 ]; then
|
||||
DC_DL_SUFFIX=
|
||||
else
|
||||
DC_DL_SUFFIX=legacy
|
||||
fi
|
||||
else
|
||||
DC_DL_SUFFIX=legacy
|
||||
fi
|
||||
sleep 1
|
||||
if [[ ! -z $(which pip) && $(pip list --local 2>&1 | grep -v DEPRECATION | grep -c docker-compose) == 1 ]]; then
|
||||
true
|
||||
#prevent breaking a working docker-compose installed with pip
|
||||
elif [[ $(curl -sL -w "%{http_code}" https://www.servercow.de/docker-compose/latest.php?vers=${DC_DL_SUFFIX} -o /dev/null) == "200" ]]; then
|
||||
LATEST_COMPOSE=$(curl -#L https://www.servercow.de/docker-compose/latest.php)
|
||||
COMPOSE_VERSION=$(docker-compose version --short)
|
||||
if [[ "$LATEST_COMPOSE" != "$COMPOSE_VERSION" ]]; then
|
||||
COMPOSE_PATH=$(which docker-compose)
|
||||
if [[ -w ${COMPOSE_PATH} ]]; then
|
||||
curl -#L https://github.com/docker/compose/releases/download/${LATEST_COMPOSE}/docker-compose-$(uname -s)-$(uname -m) > $COMPOSE_PATH
|
||||
chmod +x $COMPOSE_PATH
|
||||
else
|
||||
echo -e "\e[33mWARNING: $COMPOSE_PATH is not writable, but new version $LATEST_COMPOSE is available (installed: $COMPOSE_VERSION)\e[0m"
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo -e "\e[33mCannot determine latest docker-compose version, skipping...\e[0m"
|
||||
fi
|
||||
fi
|
||||
echo -e "\e[33mNot fetching latest docker-compose, please check for updates manually!\e[0m"
|
||||
sleep 3
|
||||
|
||||
echo -e "\e[32mFetching new images, if any...\e[0m"
|
||||
sleep 2
|
||||
docker-compose pull
|
||||
${COMPOSE_COMMAND} pull
|
||||
|
||||
# Fix missing SSL, does not overwrite existing files
|
||||
[[ ! -d data/assets/ssl ]] && mkdir -p data/assets/ssl
|
||||
@ -707,9 +686,6 @@ fi
|
||||
|
||||
# Checking for old project name bug
|
||||
sed -i --follow-symlinks 's#COMPOSEPROJECT_NAME#COMPOSE_PROJECT_NAME#g' mailcow.conf
|
||||
# Checking old, wrong bindings
|
||||
sed -i --follow-symlinks 's/HTTP_BIND=0.0.0.0/HTTP_BIND=/g' mailcow.conf
|
||||
sed -i --follow-symlinks 's/HTTPS_BIND=0.0.0.0/HTTPS_BIND=/g' mailcow.conf
|
||||
|
||||
# Fix Rspamd maps
|
||||
if [ -f data/conf/rspamd/custom/global_from_blacklist.map ]; then
|
||||
@ -744,11 +720,11 @@ else
|
||||
fi
|
||||
|
||||
if [[ ${SKIP_START} == "y" ]]; then
|
||||
echo -e "\e[33mNot starting mailcow, please run \"docker-compose up -d --remove-orphans\" to start mailcow.\e[0m"
|
||||
echo -e "\e[33mNot starting mailcow, please run \"${COMPOSE_COMMAND} up -d --remove-orphans\" to start mailcow.\e[0m"
|
||||
else
|
||||
echo -e "\e[32mStarting mailcow...\e[0m"
|
||||
sleep 2
|
||||
docker-compose up -d --remove-orphans
|
||||
${COMPOSE_COMMAND} up -d --remove-orphans
|
||||
fi
|
||||
|
||||
echo -e "\e[32mCollecting garbage...\e[0m"
|
||||
@ -763,4 +739,4 @@ fi
|
||||
#echo
|
||||
#git reflog --color=always | grep "Before update on "
|
||||
#echo
|
||||
#echo "Use \"git reset --hard hash-on-the-left\" and run docker-compose up -d afterwards."
|
||||
#echo "Use \"git reset --hard hash-on-the-left\" and run ${COMPOSE_COMMAND} up -d afterwards."
|
||||
Loading…
x
Reference in New Issue
Block a user