From 155f74fc067a155c1f3a7cf6fb1b86ce75d9cbc6 Mon Sep 17 00:00:00 2001
From: Jason Rivers <jason@jasonrivers.co.uk>
Date: Tue, 16 Feb 2016 16:34:10 +0000
Subject: [PATCH] travis changes

---
 .travis.yml |  3 ---
 build.sh    | 15 +++++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 61fb504..4081bd0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,4 @@ install:
 
 script:
   - ./build.sh
-  - docker images
-  - docker run -d --name docker-nginx-rtmp -p 1935:1935 -t docker-nginx-rtmp:latest
-  - docker ps -a
 
diff --git a/build.sh b/build.sh
index 7451358..1a4b7ff 100755
--- a/build.sh
+++ b/build.sh
@@ -1,20 +1,27 @@
 #!/bin/bash
+set -e
+
+DOCKER_RUN_IMAGE=nginx-rtmp
+DOCKER_BUILD_IMAGE=nginx-build
 
 rm -f nginx.tar.gz
 
 cd build
 
-docker build -t nginx-build .
+docker build -t ${DOCKER_BUILD_IMAGE} .
 
 cd ..
 
-DID=`docker create nginx-build`
+DID=`docker create ${DOCKER_BUILD_IMAGE}`
 
 docker cp ${DID}:/tmp/nginx.tar.gz ./
 
 docker rm ${DID}
-docker rmi nginx-build
+docker rmi ${DOCKER_BUILD_IMAGE}
 
-docker build -t nginx-rtmp .
+docker build -t ${DOCKER_RUN_IMAGE} .
 
+docker images 
+docker run -d --name ${DOCKER_RUN_IMAGE} -p 1935:1935 -t ${DOCKER_RUN_IMAGE}
+docker ps -a