Electrs still shows as unhealthy, but I got Citadel working by:
1) stopping citadel
2) purging "docker system"
3) changing the systemd unit to have
[Unit]
Requires=docker.service
and
[Service]
TimeoutStartSec=infinity
TimeoutStopSec=16min
4) and starting citadel again a week or more ago.