From 31e2c4165c178f42227fb5abb781fc8bedef3354 Mon Sep 17 00:00:00 2001
From: Travis Nielsen <tnielsen@redhat.com>
Date: Wed, 20 Jan 2021 09:09:04 -0700
Subject: [PATCH] ci: build with golang 1.15.7

Update the cross build container to use golang 1.15.7 instead
of 1.13.8. The update to build with 1.15 had only been made in the
AMI, and is now updated in the container as well.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
---
 go.mod                  |  2 +-
 images/cross/Dockerfile | 28 ++++++++++++++--------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/go.mod b/go.mod
index 76e5e16e7..6f0bbcafa 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
 module github.com/rook/rook
 
-go 1.13
+go 1.15
 
 require (
 	github.com/aws/aws-sdk-go v1.35.24
diff --git a/images/cross/Dockerfile b/images/cross/Dockerfile
index 15909d886..6fe3a7c32 100644
--- a/images/cross/Dockerfile
+++ b/images/cross/Dockerfile
@@ -17,18 +17,18 @@ FROM ubuntu:16.04
 # install build tools, compilers and cross compilers for all supported platforms
 RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -yy -q --no-install-recommends \
-        awscli \
-        ca-certificates \
-        curl \
-        docker.io \
-        git \
-        jq \
-        lsb-release \
-        make \
-        rsync \
-        runit \
-        sudo \
-        zip && \
+    awscli \
+    ca-certificates \
+    curl \
+    docker.io \
+    git \
+    jq \
+    lsb-release \
+    make \
+    rsync \
+    runit \
+    sudo \
+    zip && \
     curl -sL https://deb.nodesource.com/setup_10.x | bash - && \
     DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -yy -q --no-install-recommends nodejs && \
@@ -37,8 +37,8 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 # install golang from the official repo
-RUN GO_VERSION=1.13.8 && \
-    GO_HASH=0567734d558aef19112f2b2873caa0c600f1b4a5827930eb5a7f35235219e9d8 && \
+RUN GO_VERSION=1.15.7 && \
+    GO_HASH=0d142143794721bb63ce6c8a6180c4062bcf8ef4715e7d6d6609f3a8282629b3 && \
     curl -fsSL https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz -o golang.tar.gz && \
     echo "${GO_HASH}  golang.tar.gz" | sha256sum -c - && \
     tar -C /usr/local -xzf golang.tar.gz && \