Upgrade docker to Go 1.14

consbio · Apr 2, 2020 · f2305b5 · f2305b5
1 parent 1473ef4
commit f2305b5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,4 @@
 **/.git
 **/node_modules
-mbtiles/testdata/*
+mbtiles/testdata/*
+mbtiles/testdata-bad/*
diff --git 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
@@ -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
@@ -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)