From c27e4d020da6c45c00f5a4d529984f68c800452c Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Wed, 26 Apr 2017 12:21:50 +0100
Subject: [PATCH 1/3] Upgrade Go version to 1.8.1.

---
 build/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index 2b4466ad..89cc7df1 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.7.4
+FROM golang:1.8.1
 
 # Support Raspberry Pi 2 and newer
 ENV GOARM 7

From db855715ab14838f178641a84e0a10a1069e9b4d Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Wed, 26 Apr 2017 12:47:07 +0100
Subject: [PATCH 2/3] Upgrade Ansible's default Go version to 1.8.1.

---
 tools | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools b/tools
index cf87ca33..80dd78e6 160000
--- a/tools
+++ b/tools
@@ -1 +1 @@
-Subproject commit cf87ca33a1775de36bf793615513c85e07907466
+Subproject commit 80dd78e6e35e2b5d24960a8b128675cfe22707d4

From 4bb4d943ba292d77949663a9fe78bb05ed1212ac Mon Sep 17 00:00:00 2001
From: Marc CARRE <carre.marc@gmail.com>
Date: Wed, 26 Apr 2017 14:14:55 +0100
Subject: [PATCH 3/3] Please ./tools/lint -nocomment -notestpackage.

Fixes:
- `test/run-integration-tests.sh:160:75: arithmetic expressions must consist of names and numbers`
- `test/run-integration-tests.sh:265:56: arithmetic expressions must consist of names and numbers`
- `test/run-integration-tests.sh:295:61: arithmetic expressions must consist of names and numbers`
- `test/run-integration-tests.sh:309:49: arithmetic expressions must consist of names and numbers`
- `test/run-integration-tests.sh:316:41: arithmetic expressions must consist of names and numbers`
- `test/run-integration-tests.sh: run shfmt -i 4 -w test/run-integration-tests.sh`

See also: https://circleci.com/gh/weaveworks/weave/8685
---
 test/run-integration-tests.sh | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/test/run-integration-tests.sh b/test/run-integration-tests.sh
index a167e464..f2d74b7e 100755
--- a/test/run-integration-tests.sh
+++ b/test/run-integration-tests.sh
@@ -157,7 +157,8 @@ function create_image() {
         terraform destroy -force "$DIR/../tools/provisioning/gcp"
         rm terraform.tfstate*
         echo
-        greenly echo "> Created GCP image $IMAGE_NAME in $(date -u -d @$(($(date +%s) - begin_img)) +"%T")."
+        local end_img=$(date +%s)
+        greenly echo "> Created GCP image $IMAGE_NAME in $(date -u -d @$((end_img - begin_img)) +"%T")."
     else
         wait_for_image
     fi
@@ -261,7 +262,8 @@ function provision() {
     esac
     [ "$1" == "on" ] && set_hosts
     echo
-    greenly echo "> Provisioning took $(date -u -d @$(($(date +%s) - begin_prov)) +"%T")."
+    local end_prov=$(date +%s)
+    greenly echo "> Provisioning took $(date -u -d @$((end_prov - begin_prov)) +"%T")."
 }
 
 function configure_with_ansible() {
@@ -290,7 +292,8 @@ function configure() {
         done
 
         echo
-        greenly echo "> Configuration took $(date -u -d @$(($(date +%s) - begin_conf)) +"%T")."
+        local end_conf=$(date +%s)
+        greenly echo "> Configuration took $(date -u -d @$((end_conf - begin_conf)) +"%T")."
     fi
 }
 
@@ -303,13 +306,16 @@ function run_tests() {
     "$DIR/run_all.sh" "$@"
     local status=$?
     echo
-    greenly echo "> Tests took $(date -u -d @$(($(date +%s) - begin_tests)) +"%T")."
+    local end_tests=$(date +%s)
+    greenly echo "> Tests took $(date -u -d @$((end_tests - begin_tests)) +"%T")."
     return $status
 }
 
+# shellcheck disable=SC2155
 function end() {
     echo
-    echo "> Build took $(date -u -d @$(($(date +%s) - begin)) +"%T")."
+    local end_time=$(date +%s)
+    echo "> Build took $(date -u -d @$((end_time - begin)) +"%T")."
 }
 
 function echo_export_hosts() {