From 50639d61d1a6af5d64fa9fc7a1c348829d81b9b1 Mon Sep 17 00:00:00 2001
From: Rohith Jayawardene <gambol99@gmail.com>
Date: Fri, 23 Feb 2018 16:08:31 +0000
Subject: [PATCH] Travis Go Version 1.10 (#316)

- switching to version 1.10 golang for the travis build
- updating the golang version for the docker build
---
 .travis.yml  | 2 +-
 CHANGELOG.md | 1 +
 Makefile     | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dc736a5d..1d507a00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ services:
 - docker
 language: go
 go:
-- 1.9
+- "1.10"
 install:
 - go get github.com/Masterminds/glide
 - go get github.com/mattn/goveralls
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b3102ab..41e81498 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 FEATURES:
 * Updated the docker base image alpine 3.7 [#PR313](https://github.com/gambol99/keycloak-proxy/pull/313)
 * Added the ability to control the timeout on the initial openid configuration from .well-known/openid-configuration [#PR314](https://github.com/gambol99/keycloak-proxy/pull/314)
+* Updated to Golang version 1.10 [#PR315](https://github.com/gambol99/keycloak-proxy/pull/315)
 
 #### **2.1.1**
 
diff --git a/Makefile b/Makefile
index 3e3a68ad..5fe92f7e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ NAME=keycloak-proxy
 AUTHOR=gambol99
 AUTHOR_EMAIL=gambol99@gmail.com
 REGISTRY=quay.io
-GOVERSION ?= 1.8.3
+GOVERSION ?= 1.10
 ROOT_DIR=${PWD}
 HARDWARE=$(shell uname -m)
 GIT_SHA=$(shell git --no-pager describe --always --dirty)