From 63c909da4251c557d47dd7e12ab67a8c1812d291 Mon Sep 17 00:00:00 2001 From: Martin Schulze Date: Sun, 4 Aug 2019 10:47:17 +0200 Subject: [PATCH] Update to test-files, ignore cleanup return code --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 41490a99..4475ff4a 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ run: # instead we need to use create, network connect and start (see https://success.docker.com/article/multiple-docker-networks) docker create --name mail_smtponly_second_network \ -v "`pwd`/test/config":/tmp/docker-mailserver \ - -v "`pwd`/test":/tmp/docker-mailserver-test \ + -v "`pwd`/test/test-files":/tmp/docker-mailserver-test:ro \ -e SMTP_ONLY=1 \ -e PERMIT_DOCKER=connected-networks \ -e DMS_DEBUG=0 \ @@ -340,7 +340,7 @@ clean: mail_with_default_relay \ mail_smtponly_second_network - docker network rm ${NON_DEFAULT_DOCKER_MAIL_NETWORK_NAME} ${NON_DEFAULT_DOCKER_MAIL_NETWORK_NAME}2 + -docker network rm ${NON_DEFAULT_DOCKER_MAIL_NETWORK_NAME} ${NON_DEFAULT_DOCKER_MAIL_NETWORK_NAME}2 @if [ -d config.bak ]; then\ rm -rf config ;\ mv config.bak config ;\