From f2305b518fa81a9d7a3695abc0e4131401a936e6 Mon Sep 17 00:00:00 2001
From: "Brendan C. Ward" <bcward@astutespruce.com>
Date: Thu, 2 Apr 2020 09:30:00 -0700
Subject: [PATCH] Upgrade docker to Go 1.14

---
 .dockerignore                    | 3 ++-
 .github/actions/build/Dockerfile | 2 +-
 Dockerfile                       | 6 +++---
 README.md                        | 4 ++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index dbd7089..241b1cb 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,3 +1,4 @@
 **/.git
 **/node_modules
-mbtiles/testdata/*
\ No newline at end of file
+mbtiles/testdata/*
+mbtiles/testdata-bad/*
\ No newline at end of file
diff --git a/.github/actions/build/Dockerfile b/.github/actions/build/Dockerfile
index 8e1f44c..8d5046a 100644
--- a/.github/actions/build/Dockerfile
+++ b/.github/actions/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.13-stretch
+FROM golang:1.14-stretch
 
 RUN \
     apt-get update && \
diff --git a/Dockerfile b/Dockerfile
index bf97121..8221b9a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 # Stage 1: compile mbtileserver
-FROM golang:1.12.9-alpine
+FROM golang:1.14-alpine
 
 WORKDIR /
 RUN apk add git build-base
 COPY . .
 
-RUN GOOS=linux GO111MODULE=on go build -o /mbtileserver
+RUN GOOS=linux go build -o /mbtileserver
 
 
 # Stage 2: start from a smaller image
-FROM alpine:3.10.1
+FROM alpine:3.11
 
 WORKDIR /
 
diff --git a/README.md b/README.md
index 6b3e5e2..0a2aeb8 100644
--- a/README.md
+++ b/README.md
@@ -447,6 +447,10 @@ But do not forget to perform it in the end.
 
 ## Changes
 
+### 0.6.1
+
+-   upgraded Docker containers to Go 1.14
+
 ### 0.6
 
 -   fixed bug in map preview when bounds are not defined for a tileset (#84)