From 729235497016dde820c5760fbd66f802a481ee32 Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Wed, 6 Jun 2018 11:53:46 -0700 Subject: [PATCH] Push the gen-dockerfile image after building in cloudbuild (#448) * Need to push the gen-dockerfile image * Need to do the gen-dockerfile build --- cloudbuild-ubuntu.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/cloudbuild-ubuntu.yaml b/cloudbuild-ubuntu.yaml index 9ceaf105..2cef3b9c 100644 --- a/cloudbuild-ubuntu.yaml +++ b/cloudbuild-ubuntu.yaml @@ -84,6 +84,24 @@ steps: waitFor: ['php-onbuild'] id: php-onbuild-structure + # gen-dockerfile + - name: gcr.io/cloud-builders/docker + args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php/gen-dockerfile:$_TAG', '.'] + dir: builder/gen-dockerfile + waitFor: ['php-onbuild'] + id: gen-dockerfile + - name: gcr.io/cloud-builders/docker + args: ['run', '-v', '/workspace/builder/gen-dockerfile:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG'] + waitFor: ['test-runner'] + - name: gcr.io/${_GOOGLE_PROJECT_ID}/php/gen-dockerfile:$_TAG + args: ['--workspace', '/workspace/testapps/builder_test', '--php56-image', 'gcr.io/${_GOOGLE_PROJECT_ID}/php56:$_TAG', '--php70-image', 'gcr.io/${_GOOGLE_PROJECT_ID}/php70:$_TAG', '--php71-image', 'gcr.io/${_GOOGLE_PROJECT_ID}/php71:$_TAG'] + waitFor: ['gen-dockerfile'] + id: gen-dockerfile-run + - name: gcr.io/cloud-builders/docker + args: ['run', '-v', '/workspace/testapps/builder_test:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG'] + waitFor: ['gen-dockerfile-run', 'test-runner'] + id: gen-dockerfile-test + # php-default test - name: gcr.io/cloud-builders/docker args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-default:$_TAG', '.'] @@ -281,4 +299,5 @@ images: - gcr.io/${_GOOGLE_PROJECT_ID}/php71:$_TAG - gcr.io/${_GOOGLE_PROJECT_ID}/php70:$_TAG - gcr.io/${_GOOGLE_PROJECT_ID}/php56:$_TAG + - gcr.io/${_GOOGLE_PROJECT_ID}/php/gen-dockerfile:$_TAG - gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG