From 939f37413fc5c5c101fc1e751ce2aeb1b2fd6cfd Mon Sep 17 00:00:00 2001
From: Charles-Antoine Mathieu <ca.mathieu@criteo.com>
Date: Tue, 29 Sep 2020 15:01:20 +0200
Subject: [PATCH] Bump go version in Dockerfile and make it mint

---
 .dockerignore | 3 ---
 Dockerfile    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 62b98d88..b10020d6 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,10 +1,8 @@
 client/plik
 clients
-documentation
 release
 releases
 server/plikd
-testing
 webapp/node_modules
 webapp/bower_components
 webapp/dist
@@ -12,5 +10,4 @@ webapp/dist
 **/plik.crt
 **/plik.key
 **/files
-**/*.md
 .idea
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 0105b600..93a6e9df 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ RUN make frontend
 
 ##################################################################################
 # Builder 2: make server and clients
-FROM golang:1.14-alpine AS builder-go
+FROM golang:1.15.2-alpine AS builder-go
 
 # Install needed binaries
 RUN apk add --no-cache git make bash gcc g++