From 5c25be9feb213e37b00b1b679e456e0e9500ab7f Mon Sep 17 00:00:00 2001
From: Marwan Sulaiman <marwan.sameer@gmail.com>
Date: Wed, 27 Feb 2019 17:06:04 -0500
Subject: [PATCH] build: switch to go1.12 (#1092)

* build: switch to go1.12

* switch travis to 1.12
---
 .travis.yml          | 2 +-
 cmd/proxy/Dockerfile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5a26a8e4..13051b0c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ services:
 language: go
 install: false
 go:
-  - "1.11.x"
+  - "1.12.x"
 env:
   global:
     - PATH=${PATH}:./bin
diff --git a/cmd/proxy/Dockerfile b/cmd/proxy/Dockerfile
index 9dbb1698..ac3b32a3 100644
--- a/cmd/proxy/Dockerfile
+++ b/cmd/proxy/Dockerfile
@@ -2,7 +2,7 @@
 # https://github.com/docker-library/buildpack-deps/blob/1845b3f918f69b4c97912b0d4d68a5658458e84f/stretch/scm/Dockerfile
 # https://github.com/golang/go/blob/f082dbfd4f23b0c95ee1de5c2b091dad2ff6d930/src/cmd/go/internal/get/vcs.go#L90
 
-FROM golang:1.12-rc-alpine AS builder
+FROM golang:1.12-alpine AS builder
 
 WORKDIR $GOPATH/src/github.com/gomods/athens