From f739d9179c9b89d4fb03f61a478d889b2657c96c Mon Sep 17 00:00:00 2001
From: Thomas LEVEIL <thomasleveil@gmail.com>
Date: Sun, 6 Dec 2015 21:19:55 +0000
Subject: [PATCH 1/2] Travis FTW

---
 .travis.yml | 14 ++++++++++++++
 circle.yml  | 17 -----------------
 2 files changed, 14 insertions(+), 17 deletions(-)
 create mode 100644 .travis.yml
 delete mode 100644 circle.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..bf815a7
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+sudo: required
+services:
+  - docker
+
+before_install:
+  - docker version
+  - docker info
+  - sudo add-apt-repository ppa:duggan/bats --yes
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq bats
+  - make update-dependencies
+
+script:
+  - make test
\ No newline at end of file
diff --git a/circle.yml b/circle.yml
deleted file mode 100644
index e0ecf4d..0000000
--- a/circle.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-machine:
-  pre:
-    - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'
-    - sudo chmod 0755 /usr/bin/docker
-  services:
-    - docker
-
-dependencies:
-  override:
-    - sudo add-apt-repository ppa:duggan/bats --yes
-    - sudo apt-get update -qq
-    - sudo apt-get install -qq bats
-    - make update-dependencies
-
-test:
-  override:
-    - make test

From edbfb35dbedaf653ebd64e4825a91d1b1f1f828e Mon Sep 17 00:00:00 2001
From: Thomas LEVEIL <thomasleveil@gmail.com>
Date: Sun, 6 Dec 2015 21:31:41 +0000
Subject: [PATCH 2/2] README: change CI badge from CicleCI to TravisCI

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

diff --git a/README.md b/README.md
index 76e9987..a2ec5f5 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-![nginx 1.9.12](https://img.shields.io/badge/nginx-1.9.12-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build](https://circleci.com/gh/jwilder/nginx-proxy.svg?&style=shield&circle-token=2da3ee844076a47371bd45da81cf27409ca7306a)](https://circleci.com/gh/jwilder/nginx-proxy)
+![nginx 1.9.12](https://img.shields.io/badge/nginx-1.9.12-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build Status](https://travis-ci.org/jwilder/nginx-proxy.svg?branch=master)](https://travis-ci.org/jwilder/nginx-proxy)
 
 nginx-proxy sets up a container running nginx and [docker-gen][1].  docker-gen generates reverse proxy configs for nginx and reloads nginx when containers are started and stopped.