Second version of switching things to cloud build.

dlorenc · dlorenc · commit 95c653c7edd7 · 2016-11-03T10:40:46.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+cloudbuild.yaml
+interpreters.tar.gz
diff --git a/Dockerfile b/Dockerfile
@@ -21,7 +21,7 @@ ENV PYTHONUNBUFFERED 1
 RUN pip install --upgrade pip virtualenv
 
 # Install the Google-built interpreters
-ADD python-interpreter-builder/output/interpreters.tar.gz /
+ADD interpreters.tar.gz /
 
 # Setup the app working directory
 RUN ln -s /home/vmagent/app /app
diff --git a/Makefile b/Makefile
@@ -25,3 +25,8 @@ tests:
 .PHONY: benchmarks
 benchmarks:
 	make -C tests benchmarks
+
+.PHONY: cloudbuild
+cloudbuild:
+	envsubst <cloudbuild.yaml.in > cloudbuild.yaml
+	gcloud alpha container builds create . --config=cloudbuild.yaml
diff --git a/cloudbuild.yaml.in b/cloudbuild.yaml.in
@@ -0,0 +1,9 @@
+steps:
+- name: gcr.io/cloud-builders/docker
+  args: ['build', '--tag=interpreter', 'python-interpreter-builder']
+- name: interpreter
+  args: ['cp', '/interpreters.tar.gz', '/workspace/']
+- name: gcr.io/cloud-builders/docker
+  args: ['build', '--tag=${IMAGE_NAME}', '.']
+images:
+  ['${IMAGE_NAME}']
diff --git a/python-interpreter-builder/Makefile b/python-interpreter-builder/Makefile
@@ -6,5 +6,5 @@ build:
 	-docker rm python-interpreter-builder
 	docker run --name python-interpreter-builder google/python-interpreter-builder /bin/bash
 	mkdir -p output
-	docker cp python-interpreter-builder:/interpreters.tar.gz output/interpreters.tar.gz
+	docker cp python-interpreter-builder:/interpreters.tar.gz ../interpreters.tar.gz
 	docker rm python-interpreter-builder

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+cloudbuild.yaml`
	`2`	`+interpreters.tar.gz`