Merge branch 'master' into renovate/git.luolix.top-containerd-containerd-1.x

ckotzbauer · Aug 17, 2020 · d3f4caf · d3f4caf
2 parents 7d0c344 + b91a5cd
commit d3f4caf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.14.7 as builder
+FROM golang:1.15.0 as builder
 
 WORKDIR /go/src/app
 COPY . .

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module k8spolicy
 
-go 1.14
+go 1.15
 
 require (
 	github.com/containerd/containerd v1.4.0