Update golang Docker tag to v1.15.4 (#3920) (#3925)

david-kow · renovate[bot] · web-flow · commit 6db1914b6cc2 · 2020-11-09T10:44:15.000+01:00
Co-authored-by: Renovate Bot &lt;bot@renovateapp.com&gt;
# Conflicts:
#	.ci/Dockerfile
#	Dockerfile
#	hack/manifest-gen/Dockerfile

Co-authored-by: renovate[bot] &lt;29139614+renovate[bot]@users.noreply.github.com&gt;
diff --git a/.ci/Dockerfile b/.ci/Dockerfile
@@ -1,5 +1,5 @@
 # Docker image used for continuous integration
-FROM golang:1.15.2
+FROM golang:1.15.4
 
 ENV GOLANGCILINT_VERSION=1.27.0
 ENV SHELLCHECK_VERSION=0.7.1
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the operator binary
-FROM golang:1.15.2 as builder
+FROM golang:1.15.4 as builder
 
 ARG GO_LDFLAGS
 ARG GO_TAGS
diff --git a/hack/manifest-gen/Dockerfile b/hack/manifest-gen/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15.2 as builder
+FROM golang:1.15.4 as builder
 ADD . /manifest-gen
 WORKDIR /manifest-gen
 ENV GO111MODULE=on CGO_ENABLED=0 GOOS=linux 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.15.2 as builder`
	`1`	`+FROM golang:1.15.4 as builder`
`2`	`2`	`ADD . /manifest-gen`
`3`	`3`	`WORKDIR /manifest-gen`
`4`	`4`	`ENV GO111MODULE=on CGO_ENABLED=0 GOOS=linux`