chore: Simplify compose.yaml healthcheck (docker-mailserver#4498)

polarathene · web-flow · commit 3c193a101eb1 · 2025-06-02T07:27:53.000Z
diff --git a/compose.yaml b/compose.yaml
@@ -25,6 +25,6 @@ services:
     # cap_add:
     #   - NET_ADMIN
     healthcheck:
-      test: "ss --listening --tcp | grep -P 'LISTEN.+:smtp' || exit 1"
+      test: "ss --listening --ipv4 --tcp | grep --silent ':smtp' || exit 1"
       timeout: 3s
       retries: 0
diff --git a/test/tests/serial/tests.bats b/test/tests/serial/tests.bats
@@ -25,7 +25,7 @@ function setup_file() {
     --env SPOOF_PROTECTION=1
     --env SSL_TYPE='snakeoil'
     --ulimit "nofile=$(ulimit -Sn):$(ulimit -Hn)"
-    --health-cmd "ss --listening --tcp | grep -P 'LISTEN.+:smtp' || exit 1"
+    --health-cmd "ss --listening --ipv4 --tcp | grep --silent ':smtp' || exit 1"
   )
   _common_container_setup 'CONTAINER_ARGS_ENV_CUSTOM'
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ function setup_file() {`
`25`	`25`	`--env SPOOF_PROTECTION=1`
`26`	`26`	`--env SSL_TYPE='snakeoil'`
`27`	`27`	`--ulimit "nofile=$(ulimit -Sn):$(ulimit -Hn)"`
`28`		`- --health-cmd "ss --listening --tcp \| grep -P 'LISTEN.+:smtp' \|\| exit 1"`
	`28`	`+ --health-cmd "ss --listening --ipv4 --tcp \| grep --silent ':smtp' \|\| exit 1"`
`29`	`29`	`)`
`30`	`30`	`_common_container_setup 'CONTAINER_ARGS_ENV_CUSTOM'`
`31`	`31`