Archive-Team
/
docker-mailserver
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sorted out hostname issues 

modified:   Dockerfile
	modified:   Makefile
	modified:   test/tests.bats
This commit is contained in:
Thomas A. Kilian 2017-04-15 11:57:19 +02:00
parent a0130599c2
commit 600e076171
No known key found for this signature in database
GPG Key ID: 6403AD7CD724D228
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -9,7 +9,7 @@ ENV ONE_DIR=0
RUN apt-get update -q --fix-missing && \ RUN apt-get update -q --fix-missing && \
apt-get -y upgrade && \ apt-get -y upgrade && \
apt-get -y install postfix apt-get -y install postfix
RUN DEBIAN_FRONTEND=noninteractive apt-get update -q --fix-missing && \ RUN apt-get update -q --fix-missing && \
apt-get -y upgrade && \ apt-get -y upgrade && \
apt-get -y install --no-install-recommends \ apt-get -y install --no-install-recommends \
amavisd-new \ amavisd-new \
@ -33,6 +33,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update -q --fix-missing && \
gamin \ gamin \
gzip \ gzip \
iptables \ iptables \
locales \
libmail-spf-perl \ libmail-spf-perl \
libnet-dns-perl \ libnet-dns-perl \
libsasl2-modules \ libsasl2-modules \

2
Makefile
View File

@ -56,7 +56,7 @@ run:
-v "`pwd`/test":/tmp/docker-mailserver-test \ -v "`pwd`/test":/tmp/docker-mailserver-test \
-e PERMIT_DOCKER=network \ -e PERMIT_DOCKER=network \
-e OVERRIDE_HOSTNAME=mail.my-domain.com \ -e OVERRIDE_HOSTNAME=mail.my-domain.com \
-h unknown.domain.tld \ -h mail.my-domain.com \
-t $(NAME) -t $(NAME)
sleep 15 sleep 15
docker run -d --name mail_fail2ban \ docker run -d --name mail_fail2ban \

2
test/tests.bats
View File

@ -15,7 +15,7 @@ load 'test_helper/bats-assert/load'
} }
@test "checking configuration: hostname/domainname override: check container hostname is applied correctly" { @test "checking configuration: hostname/domainname override: check container hostname is applied correctly" {
run docker exec mail_override_hostname /bin/bash -c "hostname | grep unknown.domain.tld" run docker exec mail_override_hostname /bin/bash -c "hostname | grep mail.my-domain.com"
assert_success assert_success
} }