Issue 631 run services with supervisor by johansmitsnl · Pull Request #676 · docker-mailserver/docker-mailserver

johansmitsnl · 2017-07-30T12:36:23Z

Use the supervisor as the main process. The start-mailserver is started
from the supervisord and then this process triggers others.

Defined some default variable in the Dockerfile. In order for
supervisored to build the command lines the ENV variable need to be set.
Therefore the defaults are defined.

Some processes are not single processes like postfix and fail2ban and
they have a wrapper. The wrapper takes care of proper shutdown and checking
if the process is running or not. Supervisored will restart the wrapping
script if the process is gone.

Increased some delays between tests because sometimes they where to short
for all containers to be running.

from the supervisord and then this process triggers others. Defined some default variable in the Dockerfile. In order for supervisored to build the command lines the ENV variable need to be set. Therefore the defaults are defined. Some processes are not single processes like postfix and fail2ban and they have a wrapper. The wrapper takes care of proper shutdown and checking if the process is running or not. Supervisored will restart the wrapping script if the process is gone. Increased some delays between tests because sometimes they where to short for all containers to be running.

tomav · 2017-07-30T13:27:43Z

Restarted build.

tomav

Thanks, tests are green but could you fix these little things? Thanks @johansmitsnl

tomav · 2017-07-30T16:29:14Z

+# wait until fail2ban is dead (triggered by trap)
+while kill -0 "`cat /var/run/fail2ban/fail2ban.pid`"; do
+  sleep 5
+done


Missing newline.

tomav · 2017-07-30T16:29:31Z

+# wait until postfix is dead (triggered by trap)
+while kill -0 "`cat /var/spool/postfix/pid/master.pid`"; do
+  sleep 5
+done


Missing newline

tomav · 2017-07-30T16:30:33Z

 		notify 'task' 'Starting pop3 services' 'n'
 		mv /etc/dovecot/protocols.d/pop3d.protocol.disab /etc/dovecot/protocols.d/pop3d.protocol
-		display_startup_daemon "/usr/sbin/dovecot reload"
+		# /usr/sbin/dovecot reload


If useless, this should be removed.

tomav · 2017-07-30T16:30:38Z

 	if [ -f /tmp/docker-mailserver/dovecot.cf ]; then
 		cp /tmp/docker-mailserver/dovecot.cf /etc/dovecot/local.conf
-		/usr/sbin/dovecot reload
+		# /usr/sbin/dovecot reload


If useless, this should be removed.

tomav · 2017-07-30T16:30:57Z

+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+command=/usr/sbin/saslauthd -d -a shadow -O %(ENV_SASLAUTHD_MECH_OPTIONS)s
+pidfile=/var/run/saslauthd/saslauthd.pid


Missing newline

tomav · 2017-07-30T16:31:08Z

+autorestart=true
+stdout_logfile=/var/log/supervisor/%(program_name)s.log
+stderr_logfile=/var/log/supervisor/%(program_name)s.log
+command=/usr/local/bin/postfix-wrapper.sh


Missing newline

tomav · 2017-07-30T16:31:27Z

+@test "checking restart of process: saslauthd (saslauthd server enabled)" {
+  run docker exec mail_with_ldap /bin/bash -c "pkill saslauthd && sleep 10 && ps aux --forest | grep -v grep | grep '/usr/sbin/saslauthd'"
+  assert_success
+}


Missing newline

tomav · 2017-07-30T16:33:02Z

 		-e POSTFIX_DAGENT=lmtp:127.0.0.1:24 \
+		-e DMS_DEBUG=0 \
 		-h mail.my-domain.com -t $(NAME)
 	sleep 30


If sleep increased too 40 at the end, perhaps this one can be set to 15 like previous.

tomav · 2017-07-30T16:33:13Z

 		-e [email protected] \
+		-e DMS_DEBUG=0 \
 		-h mail.my-domain.com -t $(NAME)
 	# Wait for containers to fully start


Could you remove this comment?

johansmitsnl · 2017-07-30T17:21:25Z

@tomav pushed the changes you requested.

johansmitsnl · 2017-07-30T17:29:08Z

My editor is eating up the new line at the end, making a new commit.

…ines

johansmitsnl · 2017-07-30T17:44:31Z

@tomav I set the delay back to 20 seconds but some first check (and now to) fails when it is to low. I think it should be 40 (is was good for my testing, 30 didn't do it for me).

Sometimes it fails the tests and gives a wrong state about the test. During testing 40 seconds was the safe value.

johansmitsnl · 2017-08-04T17:27:53Z

@tomav @alinmear I have updated the PR with tests and they pass all now.
Can someone review and accept if ok?

tomav · 2017-08-07T15:39:44Z

Thanks!
I'll release a new version soon with these changes.

dolanor · 2018-01-29T00:01:01Z

Hello,

Just to know, every service runs by/with supervisor on the latest image?
So using service fail2ban stop is useless, right?

johansmitsnl · 2018-01-31T21:32:38Z

@dolanor correct. You should use the supervisorctl stop

LukeAllen and others added 10 commits July 29, 2017 10:16

installed supervisor. Still need to set tasks to run in foreground.

1858f8c

setting programs to run in foreground

663c180

seems to work now

c7824e8

cleanup

a16b753

final fixes

36a8548

tests

d1e695d

show startup output on stdout

fb825a0

set Dovecot config files before starting it

1fad287

make all processes log to console

ea6a81e

johansmitsnl mentioned this pull request Jul 30, 2017

Run services with supervisor #631

Closed

tomav suggested changes Jul 30, 2017

View reviewed changes

Remove obsolete comments, reset timeout value to old one, added new l…

7370b90

…ines

Add more time for analyzing the emails.

2ced667

Sometimes it fails the tests and gives a wrong state about the test. During testing 40 seconds was the safe value.

tomav approved these changes Aug 7, 2017

View reviewed changes

tomav merged commit 9e7959f into docker-mailserver:master Aug 7, 2017

johansmitsnl deleted the issue-631-run-services-with-supervisor branch August 7, 2017 15:49

polarathene mentioned this pull request Jun 6, 2022

chore: Remove redundant capability SYS_PTRACE #2624

Merged

4 tasks

This was referenced Jan 27, 2023

chore: Remove wrapper script for fail2ban service #3032

Merged

chore: Remove the wrapper script for Postfix (and disable chroot in master.cf) #3033

Merged

polarathene mentioned this pull request Aug 30, 2023

[TODO]: Revise LDAP support #3517

Open

polarathene mentioned this pull request Feb 16, 2025

fix(log): su syslog root #4370

Closed

12 tasks

Uh oh!

Conversation

johansmitsnl commented Jul 30, 2017

Uh oh!

tomav commented Jul 30, 2017

Uh oh!

tomav left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

johansmitsnl commented Jul 30, 2017

Uh oh!

johansmitsnl commented Jul 30, 2017

Uh oh!

johansmitsnl commented Jul 30, 2017

Uh oh!

johansmitsnl commented Aug 4, 2017

Uh oh!

tomav commented Aug 7, 2017

Uh oh!

dolanor commented Jan 29, 2018

Uh oh!

johansmitsnl commented Jan 31, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants