Merge pull request #655 from r2d4/publish-images

cloudbuild: publish skaffold images on commit and tag
GoogleContainerTools · Jun 8, 2018 · 61d9270 · 61d9270
2 parents 602db9b + abcc868
commit 61d9270
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/deploy/cloudbuild-release.yaml b/deploy/cloudbuild-release.yaml
@@ -1,9 +1,9 @@
 steps:
 # Build the container that will do the go build.
   - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-t', 'builder', '-f', 'deploy/skaffold/Dockerfile', '.']
+    args: ['build', '-t', 'gcr.io/k8s-skaffold/skaffold:$TAG_NAME', '-f', 'deploy/skaffold/Dockerfile', '.']
 # Do the go build.
-  - name: 'builder'
+  - name: 'gcr.io/k8s-skaffold/skaffold:$TAG_NAME'
     args: ['make', 'cross']
 # Upload to GCS.
   - name: 'gcr.io/cloud-builders/gsutil'
@@ -12,3 +12,4 @@ steps:
 # Upload to GCS.
   - name: 'gcr.io/cloud-builders/gsutil'
     args: ['cp', '-r', 'gs://skaffold/releases/$TAG_NAME/*', 'gs://skaffold/releases/latest/']
+images: ['gcr.io/k8s-skaffold/skaffold:$TAG_NAME']
diff --git a/deploy/cloudbuild.yaml b/deploy/cloudbuild.yaml
@@ -1,9 +1,9 @@
 steps:
 # Build the container that will do the go build.
   - name: 'gcr.io/cloud-builders/docker'
-    args: ['build', '-t', 'builder', '-f', 'deploy/skaffold/Dockerfile', '.']
+    args: ['build', '-t', 'gcr.io/k8s-skaffold/skaffold:$COMMIT_SHA', '-f', 'deploy/skaffold/Dockerfile', '.']
 # Do the go build.
-  - name: 'builder'
+  - name: 'gcr.io/k8s-skaffold/skaffold:$COMMIT_SHA'
     args: ['make', 'cross']
 # Upload to GCS.
   - name: 'gcr.io/cloud-builders/gsutil'
@@ -12,3 +12,4 @@ steps:
 # Upload to GCS.
   - name: 'gcr.io/cloud-builders/gsutil'
     args: ['cp', '-r', 'gs://skaffold/builds/$COMMIT_SHA/*', 'gs://skaffold/builds/latest/']
+images: ['gcr.io/k8s-skaffold/skaffold:$COMMIT_SHA']