Skip to content

Commit

Permalink
fix missing docker (#113)
Browse files Browse the repository at this point in the history
  • Loading branch information
mitchdraft authored Mar 6, 2019
1 parent 05c1b6d commit 74203c0
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
3 changes: 3 additions & 0 deletions changelog/v0.4.3/cloudbuild.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
changelog:
- type: NON_USER_FACING
description: "fix build issue - missing docker binaries"
23 changes: 19 additions & 4 deletions cloudbuild.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,30 @@ steps:
waitFor: ['dep']
id: 'npminstall'

- name: 'gcr.io/$PROJECT_ID/go-make'
args: ['docker-push', 'upload-github-release-assets', 'push-docs']
env:
- 'PROJECT_ROOT=github.com/solo-io/squash'
- 'GOPATH=/workspace/gopath'
- 'TAGGED_VERSION=$TAG_NAME'
- 'BUILD_ID=$BUILD_ID'
- 'GCLOUD_PROJECT_ID=$PROJECT_ID'
dir: './gopath/src/github.com/solo-io/squash'
secretEnv: ['GITHUB_TOKEN']
waitFor: ['compile', 'npminstall']
id: 'push-github-resources'

- name: 'gcr.io/$PROJECT_ID/go-vsce:0.1.3'
entrypoint: make
args: ['docker-push', 'upload-github-release-assets', 'push-docs', 'publish-extension']
args: ['publish-extension']
env:
- 'TAGGED_VERSION=$TAG_NAME'
- 'PROJECT_ROOT=github.com/solo-io/squash'
- 'GOPATH=/workspace/gopath'
dir: './gopath/src/github.com/solo-io/squash'
secretEnv: ['GITHUB_TOKEN', 'VSCODE_TOKEN']
id: 'release'
waitFor: ['compile', 'npminstall']
secretEnv: ['VSCODE_TOKEN']
waitFor: ['push-github-resources']
id: 'extension'

secrets:
- kmsKeyName: projects/solo-public/locations/global/keyRings/build/cryptoKeys/build-key
Expand All @@ -98,3 +111,5 @@ secrets:
VSCODE_TOKEN: CiQABlzmSepRzBG6r2UapqKVaJfx5X3PQgWpuKtIinDWI4IpZsASXQCCPGSGtYjgB1ARs6VcRy3J23Mlbo7zeqPamti48qk71axnOBu4pSomCTKj+4iB81E/dgJEmo9aXOIfPoSv7jEs1ijN7J326jA+AOS1M4eUQwfAWovUtmjecP0p+Q==

timeout: 3000s
options:
machineType: 'N1_HIGHCPU_8'

0 comments on commit 74203c0

Please sign in to comment.