From 287f3ed92174809d1a14be4e00e2d7499c6bd177 Mon Sep 17 00:00:00 2001 From: andryyy Date: Mon, 2 Dec 2019 14:46:47 +0100 Subject: [PATCH] [Web] Allow to use data/web/css/build/0081-custom-mailcow.css for ignored overrides --- .gitignore | 1 + data/Dockerfiles/phpfpm/docker-entrypoint.sh | 3 +++ docker-compose.yml | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9d1dbfdaa..ddd72b07d 100644 --- a/.gitignore +++ b/.gitignore @@ -15,6 +15,7 @@ data/conf/postfix/allow_mailcow_local.regexp data/conf/dovecot/sql data/conf/nextcloud-*.bak data/web/inc/vars.local.inc.php +data/web/css/build/0081-custom-mailcow.css data/assets/ssl/* .vscode/* .idea diff --git a/data/Dockerfiles/phpfpm/docker-entrypoint.sh b/data/Dockerfiles/phpfpm/docker-entrypoint.sh index 4a30c30b3..f4148a129 100755 --- a/data/Dockerfiles/phpfpm/docker-entrypoint.sh +++ b/data/Dockerfiles/phpfpm/docker-entrypoint.sh @@ -106,6 +106,9 @@ for domain in "${DOMAIN_ARR[@]}"; do done fi +# Create dummy for custom overrides of mailcow style +[[ ! -f /web/css/build/0081-custom-mailcow.css ]] && echo '/* Autogenerated by mailcow */' > /web/css/build/0081-custom-mailcow.css + # Set API options if env vars are not empty if [[ ${API_ALLOW_FROM} != "invalid" ]] && \ diff --git a/docker-compose.yml b/docker-compose.yml index bc4545165..b20c2a283 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -96,7 +96,7 @@ services: - rspamd php-fpm-mailcow: - image: mailcow/phpfpm:1.54 + image: mailcow/phpfpm:1.55 command: "php-fpm -d date.timezone=${TZ} -d expose_php=0" depends_on: - redis-mailcow