Skip to content

Commit

Permalink
Try a parameterized cloudbuild
Browse files Browse the repository at this point in the history
  • Loading branch information
msolters committed Jul 29, 2019
1 parent f9a019b commit 3009cb0
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -24,3 +24,4 @@ chrome-user-data
*.swo
documentation.json
kustomization.yaml
skaffold.yaml
5 changes: 3 additions & 2 deletions Makefile
@@ -1,15 +1,16 @@
.PHONY: all build release

repo=app-top
shorthash=`git rev-parse --short HEAD`
registry=<YOUR REPO GOES HERE>
shorthash=$(SHORT_SHA)
registry=gcr.io/$(PROJECT_ID)
base=$(registry)/$(repo)
branch=$${BRANCH_NAME:-`git rev-parse --abbrev-ref HEAD`}
image=$(base):$(shorthash)

all: build release

skaffold-run:
./skaffold.sh
DOCKER_REPO=$(registry) GIT_HASH=$(shorthash) bash kustomize.sh
DOCKER_REPO=$(registry) GIT_HASH=$(shorthash) skaffold run

Expand Down
7 changes: 7 additions & 0 deletions cloudbuild.yaml
@@ -0,0 +1,7 @@
steps:
- name: 'gcr.io/$PROJECT_ID/skaffold:alpha'
args: ['skaffold-run']
env:
- 'PROJECT_ID=$PROJECT_ID'
- 'CLOUDSDK_COMPUTE_ZONE=${_COMPUTE_ZONE}'
- 'CLOUDSDK_CONTAINER_CLUSTER=${_CONTAINER_CLUSTER}'
6 changes: 5 additions & 1 deletion skaffold.yaml → skaffold.sh 100644 → 100755
@@ -1,8 +1,11 @@
#!/usr/bin/env bash

cat <<EOF >skaffold.yaml
apiVersion: skaffold/v1beta13
kind: Config
build:
googleCloudBuild:
projectId: <YOUR PROJECT ID HERE>
projectId: ${PROJECT_ID}
artifacts:
- image: app-top
tagPolicy:
Expand All @@ -11,3 +14,4 @@ build:
deploy:
kustomize:
path: .
EOF

0 comments on commit 3009cb0

Please sign in to comment.