浏览代码

[Rspamd] Wait for PHP to not break inotify

andryyy 5 年之前
父节点
当前提交
02bb3a44a7
共有 3 个文件被更改,包括 15 次插入1 次删除
  1. 1 0
      data/Dockerfiles/rspamd/Dockerfile
  2. 13 0
      data/Dockerfiles/rspamd/docker-entrypoint.sh
  3. 1 1
      docker-compose.yml

+ 1 - 0
data/Dockerfiles/rspamd/Dockerfile

@@ -11,6 +11,7 @@ RUN apt-get update && apt-get install -y \
   gnupg2 \
   apt-transport-https \
   dnsutils \
+  netcat \
   && apt-key adv --fetch-keys https://rspamd.com/apt-stable/gpg.key \
   && echo "deb [arch=amd64] https://rspamd.com/apt-stable/ $CODENAME main" > /etc/apt/sources.list.d/rspamd.list \
   && echo "deb-src [arch=amd64] https://rspamd.com/apt-stable/ $CODENAME main" >> /etc/apt/sources.list.d/rspamd.list \

+ 13 - 0
data/Dockerfiles/rspamd/docker-entrypoint.sh

@@ -1,5 +1,18 @@
 #!/bin/bash
 
+echo "Waiting for PHP to settle..."
+sleep 10
+
+until nc phpfpm 9001 -z; do
+  echo "Waiting for PHP on port 9001..."
+  sleep 3
+done
+
+until nc phpfpm 9002 -z; do
+  echo "Waiting for PHP on port 9002..."
+  sleep 3
+done
+
 mkdir -p /etc/rspamd/plugins.d \
   /etc/rspamd/custom
 

+ 1 - 1
docker-compose.yml

@@ -68,7 +68,7 @@ services:
             - clamd
 
     rspamd-mailcow:
-      image: mailcow/rspamd:1.50
+      image: mailcow/rspamd:1.51
       build: ./data/Dockerfiles/rspamd
       stop_grace_period: 30s
       depends_on: