From 7a639692abeca1a806e4824713fe4a53403a6aa3 Mon Sep 17 00:00:00 2001
From: Travis Rowland <travis.rowland@gmail.com>
Date: Fri, 26 Jan 2018 01:54:38 -0800
Subject: [PATCH 1/6] Automated Docker builds

---
 .travis.yml | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 448718f..bd7de29 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,17 +3,23 @@ sudo: required
 services:
   - docker
 
-script:
-  - make build
+env:
+  global:
+    - NAME=phusion/baseimage
+    # - VERSION=$(TRAVIS_TAG)
+    - VERSION=$(TRAVIS_BRANCH)
 
-deploy:
-  - provider: script
-    script: make test_release
-    on:
-      branch: master
-      tags: true
-      condition: '$TRAVIS_TAG =~ ^[0-9]+(\.[0-9]+)*$'
-  - provider: script
-    script: make test_master
-    on:
-      branch: master
+before_install:
+  - docker build -t $(NAME):$(VERSION) --rm image
+  - env NAME=$(NAME) VERSION=$(VERSION) ./test/runner.sh
+
+after_success:
+  - docker login -u "$(DOCKER_USERNAME)" -p "$(DOCKER_PASSWORD)";
+    docker push $(NAME):$(VERSION);
+
+# after_success:
+#   - if [ "$(TRAVIS_BRANCH)" == "master" ]; then
+#     docker login -u "$(DOCKER_USERNAME)" -p "$(DOCKER_PASSWORD)";
+#     docker tag $(NAME):$(VERSION) $(NAME):latest
+#     docker push $(NAME):$(VERSION);
+#     fi

From 1bffe76e6a4871a8608d8b85a57c9ccd9e7c1690 Mon Sep 17 00:00:00 2001
From: Travis Rowland <travis.rowland@gmail.com>
Date: Fri, 26 Jan 2018 01:58:22 -0800
Subject: [PATCH 2/6] don't remove image

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index bd7de29..5685cff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ env:
     - VERSION=$(TRAVIS_BRANCH)
 
 before_install:
-  - docker build -t $(NAME):$(VERSION) --rm image
+  - docker build -t $(NAME):$(VERSION)
   - env NAME=$(NAME) VERSION=$(VERSION) ./test/runner.sh
 
 after_success:

From 300b96fb93a0d2bc9ed58b9b170c3f46089a3171 Mon Sep 17 00:00:00 2001
From: Travis Rowland <travis.rowland@gmail.com>
Date: Fri, 26 Jan 2018 02:01:09 -0800
Subject: [PATCH 3/6] build local Dockerfile

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5685cff..2a7ed8b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ env:
     - VERSION=$(TRAVIS_BRANCH)
 
 before_install:
-  - docker build -t $(NAME):$(VERSION)
+  - docker build -t $(NAME):$(VERSION) .
   - env NAME=$(NAME) VERSION=$(VERSION) ./test/runner.sh
 
 after_success:

From efc5865789691a6ddb08ec2721d6a64e17b3600b Mon Sep 17 00:00:00 2001
From: Travis Rowland <travis.rowland@gmail.com>
Date: Fri, 26 Jan 2018 02:17:56 -0800
Subject: [PATCH 4/6] Was using incorrect variable replacements

---
 .travis.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 2a7ed8b..4e0c531 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,20 +6,20 @@ services:
 env:
   global:
     - NAME=phusion/baseimage
-    # - VERSION=$(TRAVIS_TAG)
-    - VERSION=$(TRAVIS_BRANCH)
+    # - VERSION=${TRAVIS_TAG}
+    - VERSION=${TRAVIS_BRANCH}
 
 before_install:
-  - docker build -t $(NAME):$(VERSION) .
-  - env NAME=$(NAME) VERSION=$(VERSION) ./test/runner.sh
+  - docker build -t ${NAME}:${VERSION} --rm image
+  - env NAME=${NAME} VERSION=${VERSION} ./test/runner.sh
 
 after_success:
-  - docker login -u "$(DOCKER_USERNAME)" -p "$(DOCKER_PASSWORD)";
-    docker push $(NAME):$(VERSION);
+  - docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}";
+    docker push ${NAME}:${VERSION};
 
 # after_success:
-#   - if [ "$(TRAVIS_BRANCH)" == "master" ]; then
-#     docker login -u "$(DOCKER_USERNAME)" -p "$(DOCKER_PASSWORD)";
-#     docker tag $(NAME):$(VERSION) $(NAME):latest
-#     docker push $(NAME):$(VERSION);
+#   - if [ "${TRAVIS_BRANCH}" == "master" ]; then
+#     docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}";
+#     docker tag ${NAME}:${VERSION} ${NAME}:latest
+#     docker push ${NAME}:${VERSION};
 #     fi

From 6b8be06bba19a826fe2aa30f758827ef12fef10e Mon Sep 17 00:00:00 2001
From: Travis Rowland <travis.rowland@gmail.com>
Date: Fri, 26 Jan 2018 02:26:03 -0800
Subject: [PATCH 5/6] GitLab CI is better

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4e0c531..fd1f5a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,7 @@ env:
     # - VERSION=${TRAVIS_TAG}
     - VERSION=${TRAVIS_BRANCH}
 
-before_install:
+script:
   - docker build -t ${NAME}:${VERSION} --rm image
   - env NAME=${NAME} VERSION=${VERSION} ./test/runner.sh
 

From e81e664a726c464331893a2c70d47342cb0e0f7c Mon Sep 17 00:00:00 2001
From: Travis Rowland <travis.rowland@gmail.com>
Date: Fri, 26 Jan 2018 02:36:46 -0800
Subject: [PATCH 6/6] Push master as latest

---
 .travis.yml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index fd1f5a9..a930eda 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,10 +16,7 @@ script:
 after_success:
   - docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}";
     docker push ${NAME}:${VERSION};
-
-# after_success:
-#   - if [ "${TRAVIS_BRANCH}" == "master" ]; then
-#     docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}";
-#     docker tag ${NAME}:${VERSION} ${NAME}:latest
-#     docker push ${NAME}:${VERSION};
-#     fi
+  - if [ "${TRAVIS_BRANCH}" == "master" ]; then
+    docker tag ${NAME}:${VERSION} ${NAME}:latest
+    docker push ${NAME}:latest;
+    fi