From 27f21740c46b090b3dc4e567a64d49a5184a1047 Mon Sep 17 00:00:00 2001
From: Michael Kaye <1917473+michaelkaye@users.noreply.github.com>
Date: Mon, 26 Nov 2018 10:10:51 +0000
Subject: [PATCH] Update build process

Move to go 11
Ensure we lint as part of docker build.
---
 .dockerignore    |  1 -
 .travis.yml      |  2 +-
 Dockerfile       | 11 ++++++++---
 hooks/pre-commit |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index ca4fe73..ec7b49e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,5 @@
 vendor/pkg
 vendor/src
 pkg
-hooks
 bin
 .git
diff --git a/.travis.yml b/.travis.yml
index aa6250c..5659347 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: go
 go:
- - 1.7
+ - 1.11
 install:
  - go get github.com/constabulary/gb/...
  - go get github.com/golang/lint/golint
diff --git a/Dockerfile b/Dockerfile
index 9761d79..43f1e7d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,18 @@
 # Build go-neb
-FROM golang:1.10-alpine as builder
+FROM golang:1.11-alpine as builder
+
+RUN apk add --no-cache -t build-deps git gcc musl-dev go
 
 COPY . /tmp/go-neb
 WORKDIR /tmp/go-neb
-RUN apk add --no-cache -t build-deps git gcc musl-dev go \
-    && go get -u github.com/constabulary/gb/... \
+RUN go get -u github.com/constabulary/gb/... \
+    && go get github.com/golang/lint/golint \
+    && go get github.com/fzipp/gocyclo \
     && gb vendor restore \
     && gb build -f github.com/matrix-org/go-neb
 
+# Ensures we're lint-free
+RUN /tmp/go-neb/hooks/pre-commit
 
 # Run go-neb
 FROM alpine:3.7
diff --git a/hooks/pre-commit b/hooks/pre-commit
index cc0e2f0..cb9cd87 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/sh
 
 set -eu