From e6c5709acf1108c8f305535449d5f9006ba2a988 Mon Sep 17 00:00:00 2001
From: madmath03 <mb.mathieu.brunot@gmail.com>
Date: Sat, 24 Mar 2018 19:29:26 +0100
Subject: [PATCH 1/5] Fix #1 by adding basic Travis CI

---
 .travis.yml | 31 +++++++++++++++++++++++++++++++
 README.md   |  5 +++++
 2 files changed, 36 insertions(+)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..836c547
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,31 @@
+dist: trusty
+sudo: required
+
+services: docker
+
+language: bash
+
+branches:
+  only:
+    - master
+
+before_script:
+  - env | sort
+  - image="roundcube/roundcubemail:${VERSION}${VARIANT:+-$VARIANT}"
+  - dir="php-${VARIANT}"
+
+script:
+  - travis_retry docker build -t "$image" "$dir"
+
+after_script:
+  - docker images
+  - docker run -d "$image" "$dir"
+  - docker ps
+  - docker logs "$image"
+
+notifications:
+  email: false
+
+env: # Environments
+    - VERSION=1.3.4 VARIANT=fpm
+    - VERSION=1.3.4 VARIANT=apache
diff --git a/README.md b/README.md
index b626468..657fe07 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,8 @@
+
+[![Build Status](https://travis-ci.org/roundcube/roundcubemail-docker.svg)](https://travis-ci.org/roundcube/roundcubemail-docker)
+[![Docker Automated buid](https://img.shields.io/docker/build/roundcube/roundcubemail-docker.svg)](https://hub.docker.com/r/roundcube/roundcubemail-docker/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/roundcube/roundcubemail-docker.svg)](https://hub.docker.com/r/roundcube/roundcubemail-docker/)
+
 # Running Roundcube in a Docker Container
 
 The simplest method is to run the official image:

From e0cf0b627db1c38eafd40015d834a0afaf006c21 Mon Sep 17 00:00:00 2001
From: madmath03 <mb.mathieu.brunot@gmail.com>
Date: Sat, 24 Mar 2018 19:32:30 +0100
Subject: [PATCH 2/5] Fix link to docker hub badge

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 657fe07..cf65685 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 
 [![Build Status](https://travis-ci.org/roundcube/roundcubemail-docker.svg)](https://travis-ci.org/roundcube/roundcubemail-docker)
-[![Docker Automated buid](https://img.shields.io/docker/build/roundcube/roundcubemail-docker.svg)](https://hub.docker.com/r/roundcube/roundcubemail-docker/)
-[![Docker Pulls](https://img.shields.io/docker/pulls/roundcube/roundcubemail-docker.svg)](https://hub.docker.com/r/roundcube/roundcubemail-docker/)
+[![Docker Automated buid](https://img.shields.io/docker/build/roundcube/roundcubemail.svg)](https://hub.docker.com/r/roundcube/roundcubemail/)
+[![Docker Pulls](https://img.shields.io/docker/pulls/roundcube/roundcubemail.svg)](https://hub.docker.com/r/roundcube/roundcubemail/)
 
 # Running Roundcube in a Docker Container
 

From 591e37a98212f4c39d9896378bb7d7f3d9395f61 Mon Sep 17 00:00:00 2001
From: madmath03 <mb.mathieu.brunot@gmail.com>
Date: Sat, 24 Mar 2018 22:12:23 +0100
Subject: [PATCH 3/5] Remove Docker build badge

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index cf65685..5f7f94d 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 
 [![Build Status](https://travis-ci.org/roundcube/roundcubemail-docker.svg)](https://travis-ci.org/roundcube/roundcubemail-docker)
-[![Docker Automated buid](https://img.shields.io/docker/build/roundcube/roundcubemail.svg)](https://hub.docker.com/r/roundcube/roundcubemail/)
 [![Docker Pulls](https://img.shields.io/docker/pulls/roundcube/roundcubemail.svg)](https://hub.docker.com/r/roundcube/roundcubemail/)
 
 # Running Roundcube in a Docker Container

From cfe274bdfa865f5e83fa3c0f8ec0076be2d21c78 Mon Sep 17 00:00:00 2001
From: madmath03 <mb.mathieu.brunot@gmail.com>
Date: Sat, 24 Mar 2018 22:12:55 +0100
Subject: [PATCH 4/5] Fix #6

---
 php-apache/Dockerfile | 2 +-
 php-fpm/Dockerfile    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/php-apache/Dockerfile b/php-apache/Dockerfile
index 9512ced..5fb787a 100644
--- a/php-apache/Dockerfile
+++ b/php-apache/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:7.1-apache
-MAINTAINER Thomas Bruederli <thomas@roundcube.net>
+LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN apt-get -qq update \
   && apt-get install -qq \
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index f07ccff..17863a1 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -1,5 +1,5 @@
 FROM php:7.1-fpm
-MAINTAINER Thomas Bruederli <thomas@roundcube.net>
+LABEL maintainer="Thomas Bruederli <thomas@roundcube.net>"
 
 RUN apt-get -qq update \
   && apt-get install -qq \

From a8fe345e4c324dcd5de479832e372a177a6fac3e Mon Sep 17 00:00:00 2001
From: madmath03 <mb.mathieu.brunot@gmail.com>
Date: Mon, 26 Mar 2018 16:42:57 +0200
Subject: [PATCH 5/5] Fix container name for logs

---
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 836c547..57fed75 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,7 @@ branches:
 
 before_script:
   - env | sort
+  - name="roundcubemail"
   - image="roundcube/roundcubemail:${VERSION}${VARIANT:+-$VARIANT}"
   - dir="php-${VARIANT}"
 
@@ -19,9 +20,9 @@ script:
 
 after_script:
   - docker images
-  - docker run -d "$image" "$dir"
+  - docker run --name "$name" -d "$image" "$dir"
   - docker ps
-  - docker logs "$image"
+  - docker logs "$name"
 
 notifications:
   email: false