Create a "runtime builder" image that builds other Docker images

Doug Greiman · Doug Greiman · commit e4855c2c50f0 · 2017-06-15T18:23:31.000-07:00
This builder will be called by the Google Cloud SDK during "gcloud app
deploy" to create Docker images for AppEngine Flex applications.
diff --git a/build.sh b/build.sh
@@ -113,6 +113,7 @@ echo "Using base image name ${FULL_BASE_IMAGE}"
 
 # Generate Dockerfiles
 for outfile in \
+  builder/gen-dockerfile/Dockerfile \
   python-interpreter-builder/Dockerfile \
   runtime-image/Dockerfile \
   tests/benchmark/Dockerfile \
@@ -123,6 +124,14 @@ for outfile in \
   envsubst <"${outfile}".in >"${outfile}" '$DEBIAN_BASE_IMAGE $FULL_BASE_IMAGE $GOOGLE_CLOUD_PROJECT_FOR_TESTS'
 done
 
+# Make some files available to the runtime builder Docker context
+for file in \
+  gen_dockerfile.py \
+  validation_utils.py \
+  ; do
+  cp -a "scripts/${file}" "builder/gen-dockerfile/${file}"
+done
+
 # Build images and push to GCR
 if [ "${build}" -eq 1 ]; then
   echo "Building images"
diff --git a/builder/gen-dockerfile/.gitignore b/builder/gen-dockerfile/.gitignore
@@ -0,0 +1,2 @@
+Dockerfile
+*.py
diff --git a/builder/gen-dockerfile/Dockerfile.in b/builder/gen-dockerfile/Dockerfile.in
@@ -0,0 +1,13 @@
+FROM ${FULL_BASE_IMAGE}
+LABEL python_version=python3.5
+RUN virtualenv --no-download /env -p python3.5
+
+# Set virtualenv environment variables. This is equivalent to running
+# source /env/bin/activate
+ENV VIRTUAL_ENV /env
+ENV PATH /env/bin:$PATH
+ADD requirements.txt /builder/
+RUN pip install -r /builder/requirements.txt
+ADD . /builder/
+WORKDIR /workspace
+ENTRYPOINT [ "python", "/builder/gen_dockerfile.py" ]
diff --git a/builder/gen-dockerfile/requirements.txt b/builder/gen-dockerfile/requirements.txt
@@ -0,0 +1 @@
+pyyaml
diff --git a/builder/python.yaml b/builder/python.yaml
@@ -0,0 +1,12 @@
+# This is a cloudbuild.yaml template for the runtime builder
+steps:
+- # Generate application Dockerfile
+  name: 'gcr.io/gcp-runtimes/python/gen-dockerfile:latest'
+  args: [
+    '--base-image=gcr.io/google-appengine/python:latest'
+  ]
+- # Use that Dockerfile to create final application image
+  name: 'gcr.io/cloud-builders/docker:latest'
+  args: ['build', '-t', '$_OUTPUT_IMAGE', '.']
+images:
+ - '$_OUTPUT_IMAGE' 
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -1,18 +1,18 @@
 timeout: 7200s
 steps:
-- name: gcr.io/cloud-builders/docker:latest
-  # Compile Python interpreters from source
+- # Compile Python interpreters from source
+  name: gcr.io/cloud-builders/docker:latest
   args: ['build', '--tag=${_DOCKER_NAMESPACE}/python/interpreter-builder:${_TAG}',
          '--no-cache', '/workspace/python-interpreter-builder/']
-- name: ${_DOCKER_NAMESPACE}/python/interpreter-builder:${_TAG}
-  # Copy interpreters back to workspace
+- # Copy interpreters back to workspace
+  name: ${_DOCKER_NAMESPACE}/python/interpreter-builder:${_TAG}
   args: ['cp', '/interpreters.tar.gz', '/workspace/runtime-image/interpreters.tar.gz']
-- name: gcr.io/cloud-builders/docker:latest
-  # Build base runtime image
+- # Build base runtime image
+  name: gcr.io/cloud-builders/docker:latest
   args: ['build', '--tag=${_DOCKER_NAMESPACE}/python:${_TAG}',
          '--no-cache', '/workspace/runtime-image/']
-- name: gcr.io/gcp-runtimes/structure_test:latest
-  # Validate structure of base runtime image
+- # Validate structure of base runtime image
+  name: gcr.io/gcp-runtimes/structure_test:latest
   args: [
     '-i', '${_DOCKER_NAMESPACE}/python:${_TAG}',
     '--config', '/workspace/tests/virtualenv/virtualenv_default.yaml',
@@ -25,11 +25,17 @@ steps:
     '--config', '/workspace/tests/license-test/license-test.yaml',
     '-v'
     ]
-- name: gcr.io/cloud-builders/docker:latest
-  # Run google client library unit tests against base runtime image
+- # Build image to run google client library unit tests
+  name: gcr.io/cloud-builders/docker:latest
   args: ['build', '--tag=${_DOCKER_NAMESPACE}/python/tests/google-cloud-python:${_TAG}',
          '--no-cache', '/workspace/tests/google-cloud-python/']
-- name: ${_DOCKER_NAMESPACE}/python/tests/google-cloud-python:${_TAG}
+- # Run google client library unit tests
+  name: ${_DOCKER_NAMESPACE}/python/tests/google-cloud-python:${_TAG}
+- # Build runtime builder image
+  name: gcr.io/cloud-builders/docker:latest
+  args: ['build', '--tag=${_DOCKER_NAMESPACE}/python/builder/gen-dockerfile:${_TAG}',
+         '--no-cache', '/workspace/builder/gen-dockerfile/']
 images: [
-  '${_DOCKER_NAMESPACE}/python:${_TAG}'
+  '${_DOCKER_NAMESPACE}/python:${_TAG}',
+  '${_DOCKER_NAMESPACE}/python/builder/gen-dockerfile:${_TAG}',
 ]
