瀏覽代碼

[Web] Allow to use data/web/css/build/0081-custom-mailcow.css for ignored overrides

andryyy 5 年之前
父節點
當前提交
287f3ed921
共有 3 個文件被更改,包括 5 次插入1 次删除
  1. 1 0
      .gitignore
  2. 3 0
      data/Dockerfiles/phpfpm/docker-entrypoint.sh
  3. 1 1
      docker-compose.yml

+ 1 - 0
.gitignore

@@ -15,6 +15,7 @@ data/conf/postfix/allow_mailcow_local.regexp
 data/conf/dovecot/sql
 data/conf/dovecot/sql
 data/conf/nextcloud-*.bak
 data/conf/nextcloud-*.bak
 data/web/inc/vars.local.inc.php
 data/web/inc/vars.local.inc.php
+data/web/css/build/0081-custom-mailcow.css
 data/assets/ssl/*
 data/assets/ssl/*
 .vscode/*
 .vscode/*
 .idea
 .idea

+ 3 - 0
data/Dockerfiles/phpfpm/docker-entrypoint.sh

@@ -106,6 +106,9 @@ for domain in "${DOMAIN_ARR[@]}"; do
 done
 done
 fi
 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
 # Set API options if env vars are not empty
 
 
 if [[ ${API_ALLOW_FROM} != "invalid" ]] && \
 if [[ ${API_ALLOW_FROM} != "invalid" ]] && \

+ 1 - 1
docker-compose.yml

@@ -96,7 +96,7 @@ services:
             - rspamd
             - rspamd
 
 
     php-fpm-mailcow:
     php-fpm-mailcow:
-      image: mailcow/phpfpm:1.54
+      image: mailcow/phpfpm:1.55
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
       depends_on:
       depends_on:
         - redis-mailcow
         - redis-mailcow