From f02a1836948fdada68df04bf4af1928f5655f48b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Sat, 15 Dec 2018 20:52:57 +0200
Subject: [PATCH 1/3] Enable Travis autobuilds for 1.5 This is a simplified
 backport from master, whitout any testing.

---
 .travis.yml     | 27 +++++++++++++++++++++++++
 tests/build.yml | 52 +++++++++++++++++++++++++++++++++++++++++++++++++
 tests/deploy.sh |  4 ++++
 3 files changed, 83 insertions(+)
 create mode 100644 tests/build.yml
 create mode 100755 tests/deploy.sh

diff --git a/.travis.yml b/.travis.yml
index a86625e..f763e3e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,2 +1,29 @@
+sudo: required
+services: docker
+addons:
+  apt:
+    packages:
+      - docker-ce
+
+env:
+  - MAILU_VERSION=$TRAVIS_BRANCH
+language: python
+python:
+  - "3.6"
+install:
+  - sudo curl -L https://github.com/docker/compose/releases/download/1.23.0-rc3/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
+  - sudo chmod +x /usr/local/bin/docker-compose
+
+before_script:
+  - docker-compose -v
+  - docker-compose -f tests/build.yml build
+
 script:
   - /bin/true
+
+deploy:
+  provider: script
+  script: bash tests/deploy.sh
+  on:
+    all_branches: true
+    condition: -n $DOCKER_UN
diff --git a/tests/build.yml b/tests/build.yml
new file mode 100644
index 0000000..299a9af
--- /dev/null
+++ b/tests/build.yml
@@ -0,0 +1,52 @@
+version: '3'
+
+services:
+
+  front:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}nginx:${MAILU_VERSION:-local}
+    build: ../core/nginx
+
+  imap:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}dovecot:${MAILU_VERSION:-local}
+    build: ../core/dovecot
+
+  smtp:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}postfix:${MAILU_VERSION:-local}
+    build: ../core/postfix
+
+  antispam:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}rspamd:${MAILU_VERSION:-local}
+    build: ../services/rspamd
+
+  antivirus:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}clamav:${MAILU_VERSION:-local}
+    build: ../optional/clamav
+
+  webdav:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}radicale:${MAILU_VERSION:-local}
+    build: ../optional/radicale
+
+  admin:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}admin:${MAILU_VERSION:-local}
+    build: ../core/admin
+
+  roundcube:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}roundcube:${MAILU_VERSION:-local}
+    build: ../webmails/roundcube
+
+  rainloop:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}rainloop:${MAILU_VERSION:-local}
+    build: ../webmails/rainloop
+
+  fetchmail:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}fetchmail:${MAILU_VERSION:-local}
+    build: ../services/fetchmail
+
+  none:
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}none:${MAILU_VERSION:-local}
+    build: ../core/none
+
+# Uncomment next section after docs Dockerfile creation.
+#  docs:
+#    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}docs:${MAILU_VERSION:-local}
+#    build: ../docs
diff --git a/tests/deploy.sh b/tests/deploy.sh
new file mode 100755
index 0000000..0526a21
--- /dev/null
+++ b/tests/deploy.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+docker login -u $DOCKER_UN -p $DOCKER_PW
+docker-compose -f tests/build.yml push

From 1c39af464d525938db9c5b831c81a7824e2deeb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Sat, 15 Dec 2018 21:00:58 +0200
Subject: [PATCH 2/3] Move radicale to edge in able to build

---
 optional/radicale/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/optional/radicale/Dockerfile b/optional/radicale/Dockerfile
index 6749606..dce888b 100644
--- a/optional/radicale/Dockerfile
+++ b/optional/radicale/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.7
+FROM alpine:edge
 
 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
  && apk add --no-cache radicale@testing py-dulwich@testing

From 6869b3096b705a1cc991efc2da97c8d062983b46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= <muhlemmer@gmail.com>
Date: Sat, 15 Dec 2018 21:40:00 +0200
Subject: [PATCH 3/3] Use MAILU_VERSION from Travis for Docs build

---
 tests/build.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/build.yml b/tests/build.yml
index 299a9af..bb6d718 100644
--- a/tests/build.yml
+++ b/tests/build.yml
@@ -49,4 +49,7 @@ services:
 # Uncomment next section after docs Dockerfile creation.
 #  docs:
 #    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX}docs:${MAILU_VERSION:-local}
-#    build: ../docs
+#    build:
+#      context: ../docs
+#      args:
+#        version: ${MAILU_VERSION:-local}