From 3758ab754e3b35b643b9eb58fe25cf93f901c4c2 Mon Sep 17 00:00:00 2001
From: jfoutts-celo <57463555+jfoutts-celo@users.noreply.github.com>
Date: Tue, 18 Feb 2020 11:08:54 -0800
Subject: [PATCH] Address flaky docker builds (#2777)

---
 cloudbuild.yaml                     | 10 +++++-----
 packages/walletkit/bin/build-sdk.js |  9 +++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 21b269ef6c7..c067f495444 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -4,7 +4,7 @@
 steps:
 
 - id: "docker:celotool"
-  name: gcr.io/kaniko-project/executor:latest
+  name: gcr.io/kaniko-project/executor:v0.16.0
   args: [
     "--dockerfile=dockerfiles/celotool/Dockerfile",
     "--cache=true",
@@ -13,7 +13,7 @@ steps:
   waitFor: ['-']
 
 - id: "docker:transaction-metrics-exporter"
-  name: gcr.io/kaniko-project/executor:latest
+  name: gcr.io/kaniko-project/executor:v0.16.0
   args: [
     "--dockerfile=dockerfiles/transaction-metrics-exporter/Dockerfile",
     "--cache=true",
@@ -22,7 +22,7 @@ steps:
   waitFor: ['-']
 
 - id: "docker:cli"
-  name: gcr.io/kaniko-project/executor:latest
+  name: gcr.io/kaniko-project/executor:v0.16.0
   args: [
     "--dockerfile=dockerfiles/cli/Dockerfile",
     "--cache=true",
@@ -33,7 +33,7 @@ steps:
   waitFor: ['-']
 
 - id: "docker:attestation-service"
-  name: gcr.io/kaniko-project/executor:latest
+  name: gcr.io/kaniko-project/executor:v0.16.0
   args: [
     "--dockerfile=dockerfiles/attestation-service/Dockerfile",
     "--cache=true",
@@ -42,7 +42,7 @@ steps:
   waitFor: ['-']
 
 - id: "docker:leaderboard"
-  name: gcr.io/kaniko-project/executor:latest
+  name: gcr.io/kaniko-project/executor:v0.16.0
   args: [
     "--dockerfile=dockerfiles/leaderboard/Dockerfile",
     "--cache=true",
diff --git a/packages/walletkit/bin/build-sdk.js b/packages/walletkit/bin/build-sdk.js
index 89d2eb28abb..305e2159dc6 100755
--- a/packages/walletkit/bin/build-sdk.js
+++ b/packages/walletkit/bin/build-sdk.js
@@ -22,8 +22,13 @@ function getEnvFile(celoEnv) {
 }
 
 function isProduction(env) {
-  const envConfig = config({ path: getEnvFile(env) })
-  return envConfig.parsed['TESTNET_PROJECT_NAME'] === 'celo-testnet-production'
+  try {
+    const envConfig = config({ path: getEnvFile(env) })
+    return envConfig.parsed['TESTNET_PROJECT_NAME'] === 'celo-testnet-production'
+  } catch (e) {
+    console.log(`Error: `, e, `, setting isProduction = false`)
+    return false
+  }
 }
 
 // TODO(asa): Use @google-cloud/storage, tar-stream to do all of this directly in node