From 1f56e06fb9897cabca85d9229a70e3ccfca928c3 Mon Sep 17 00:00:00 2001
From: James Hillyerd <james@hillyerd.com>
Date: Sat, 10 Mar 2018 12:45:56 -0800
Subject: [PATCH] docker: fix build for #79

- Build with Go 1.10
- install.sh: git fetch fails with ssh remotes, removed
---
 Dockerfile            | 2 +-
 etc/docker/install.sh | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index cebab97..ba393f5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Docker build file for Inbucket, see https://www.docker.io/
 # Inbucket website: http://www.inbucket.org/
 
-FROM golang:1.9-alpine
+FROM golang:1.10-alpine
 MAINTAINER James Hillyerd, @jameshillyerd
 
 # Configuration (WORKDIR doesn't support env vars)
diff --git a/etc/docker/install.sh b/etc/docker/install.sh
index 916c745..54507db 100755
--- a/etc/docker/install.sh
+++ b/etc/docker/install.sh
@@ -16,8 +16,6 @@ apk add --no-cache --virtual .build-deps git
 # Setup
 export GOBIN="$bindir"
 cd "$srcdir"
-# Fetch tags for describe
-git fetch -t
 builddate="$(date -Iseconds)"
 buildver="$(git describe --tags --always)"
 
@@ -30,7 +28,7 @@ echo "### Testing Inbucket"
 go test ./...
 
 echo "### Building Inbucket"
-go build -o inbucket -ldflags "-X 'main.version=$buildver' -X 'main.date=$builddate'" -v .
+go build -o inbucket -ldflags "-X 'main.version=$buildver' -X 'main.date=$builddate'" -v ./cmd/inbucket
 
 echo "### Installing Inbucket"
 set -x