Skip to content

Commit

Permalink
Address flaky docker builds (#2777)
Browse files Browse the repository at this point in the history
  • Loading branch information
jfoutts-celo authored Feb 18, 2020
1 parent 7514d09 commit 3758ab7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 7 deletions.
10 changes: 5 additions & 5 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down
9 changes: 7 additions & 2 deletions packages/walletkit/bin/build-sdk.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3758ab7

Please sign in to comment.