github-com-docker-mailserver/docker-mailserver
1
0
Fork 0
mirror of https://github.com/docker-mailserver/docker-mailserver.git synced 2024-01-19 02:48:50 +00:00
Code Issues Projects Releases Wiki Activity

Calling supervisord directly instead of via shell (Closes: #1047, #1074)

Browse source
This commit is contained in:
Daniel Panteleit 2018-11-04 20:23:50 +01:00 committed by Johan Smits
parent 351c9c80a8
commit cc56b4f89e
4 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -219,6 +219,6 @@ COPY target/supervisor/conf.d/* /etc/supervisor/conf.d/
EXPOSE 25 587 143 465 993 110 995 4190 EXPOSE 25 587 143 465 993 110 995 4190
CMD supervisord -c /etc/supervisor/supervisord.conf CMD ["supervisord", "-c", "/etc/supervisor/supervisord.conf"]
ADD target/filebeat.yml.tmpl /etc/filebeat/filebeat.yml.tmpl ADD target/filebeat.yml.tmpl /etc/filebeat/filebeat.yml.tmpl

2
setup.sh
View file

@ -7,7 +7,7 @@
INFO=$(docker ps \ INFO=$(docker ps \
--no-trunc \ --no-trunc \
--format="{{.Image}}\t{{.Names}}\t{{.Command}}" | \ --format="{{.Image}}\t{{.Names}}\t{{.Command}}" | \
grep "/bin/sh -c 'supervisord -c /etc/supervisor/supervisord.conf'") grep "supervisord -c /etc/supervisor/supervisord.conf")
IMAGE_NAME=$(echo $INFO | awk '{print $1}') IMAGE_NAME=$(echo $INFO | awk '{print $1}')
CONTAINER_NAME=$(echo $INFO | awk '{print $2}') CONTAINER_NAME=$(echo $INFO | awk '{print $2}')

2
target/start-mailserver.sh
View file

@ -389,7 +389,7 @@ function _check_hostname() {
if ( ! echo $HOSTNAME | grep -E '^(\S+[.]\S+)$' > /dev/null ); then if ( ! echo $HOSTNAME | grep -E '^(\S+[.]\S+)$' > /dev/null ); then
notify 'err' "Setting hostname/domainname is required" notify 'err' "Setting hostname/domainname is required"
kill -6 `cat /var/run/supervisord.pid` && return 1 kill `cat /var/run/supervisord.pid` && return 1
else else
notify 'inf' "Domain has been set to $DOMAINNAME" notify 'inf' "Domain has been set to $DOMAINNAME"
notify 'inf' "Hostname has been set to $HOSTNAME" notify 'inf' "Hostname has been set to $HOSTNAME"

11
test/tests.bats
View file

@ -6,7 +6,7 @@ load 'test_helper/bats-assert/load'
@test "checking configuration: hostname/domainname" { @test "checking configuration: hostname/domainname" {
run docker run `docker inspect --format '{{ .Config.Image }}' mail` run docker run `docker inspect --format '{{ .Config.Image }}' mail`
assert_failure assert_success
} }
@test "checking configuration: hostname/domainname override" { @test "checking configuration: hostname/domainname override" {
@ -1785,3 +1785,12 @@ load 'test_helper/bats-assert/load'
run docker exec mail grep "Subject: Root Test Message" /var/mail/localhost.localdomain/user1/new/ -R run docker exec mail grep "Subject: Root Test Message" /var/mail/localhost.localdomain/user1/new/ -R
assert_success assert_success
} }
#
# clean exit
#
@test "checking that the container stops cleanly" {
run docker stop -t 60 mail
assert_success
}