Merge branch 'master' into feat-setup

2018-10-31 20:11:52 +01:00
parent ffdef18bd6 09abaff9b6
commit ca4804653d
19 changed files with 460 additions and 9 deletions
--- a/tests/build.yml
+++ b/tests/build.yml
@@ -6,6 +6,10 @@ services:
    image: ${DOCKER_ORG:-mailu}/nginx:${MAILU_VERSION:-local}
    build: ../core/nginx

+  resolver:
+    image: ${DOCKER_ORG:-mailu}/unbound:${VERSION:-local}
+    build: ../services/unbound
+
  imap:
    image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-local}
    build: ../core/dovecot