From fd7e13c98e3186a86461d45bddf42682749fd153 Mon Sep 17 00:00:00 2001
From: Martin Polden <mpolden@mpolden.no>
Date: Sat, 16 Mar 2019 15:14:32 +0100
Subject: [PATCH] Push to Docker Hub from Travis

---
 .travis.yml | 10 ++++++----
 Makefile    | 10 ++++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b9e5d87..8532002 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,9 @@ env:
   - GO111MODULE=on
 
 deploy:
-  provider: heroku
-  app: ifconfig-co
-  api_key:
-    secure: IQG/ls5Zu0yua5Ynn5EL9JCPjo1/WcmS0z7BSaXWdgW+JIWFm7oF5z54bUZHl/q1tTuWzAJk59zSTYJijtQqh2Ssl3fLu3uFDwyJSrOuUu1akPlETam8NpdbH4lPkFp75JSDdDXV08c0APmeLL6gqRuTrUuufu69Wigjq4gLo+o=
+  - provider: script
+    script: make docker-push
+  - provider: heroku
+    app: ifconfig-co
+    api_key:
+      secure: IQG/ls5Zu0yua5Ynn5EL9JCPjo1/WcmS0z7BSaXWdgW+JIWFm7oF5z54bUZHl/q1tTuWzAJk59zSTYJijtQqh2Ssl3fLu3uFDwyJSrOuUu1akPlETam8NpdbH4lPkFp75JSDdDXV08c0APmeLL6gqRuTrUuufu69Wigjq4gLo+o=
diff --git a/Makefile b/Makefile
index ff5000e..ab606a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+DOCKER_IMAGE := mpolden/echoip
 OS := $(shell uname)
 ifeq ($(OS),Linux)
 	TAR_OPTS := --wildcards
@@ -31,3 +32,12 @@ $(databases):
 	test ! -f data/GeoLite2-Country.mmdb || mv data/GeoLite2-Country.mmdb data/country.mmdb
 
 geoip-download: $(databases)
+
+docker-build:
+	docker build -t $(DOCKER_IMAGE) .
+
+docker-login:
+	@echo "$(DOCKER_PASSWORD)" | docker login -u "$(DOCKER_USERNAME)" --password-stdin
+
+docker-push: docker-build docker-login
+	docker push $(DOCKER_IMAGE)