From 37e17678d8438e2ff9b9e30dd918937ef36c2232 Mon Sep 17 00:00:00 2001
From: David Bendory <bendory@users.noreply.github.com>
Date: Tue, 24 Jul 2018 15:55:37 -0400
Subject: [PATCH] Use `gcloud builds` surface. (#455)

* Use `gcloud builds` surface.

* Use new `gcloud builds` surface.

* Use new `gcloud builds` surface.
---
 package-builder/build_packages.sh | 2 +-
 scripts/build_images.sh           | 4 ++--
 scripts/run_acceptance_tests.sh   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-builder/build_packages.sh b/package-builder/build_packages.sh
index 3a41f1ce..8d003de3 100755
--- a/package-builder/build_packages.sh
+++ b/package-builder/build_packages.sh
@@ -34,7 +34,7 @@ fi
 for VERSION in $(echo ${PHP_VERSIONS} | tr "," "\n")
 do
     echo "Building packages for PHP ${VERSION}"
-    gcloud container builds submit . --config=build-packages.yaml \
+    gcloud builds submit . --config=build-packages.yaml \
                                      --substitutions _PHP_VERSION=${VERSION},_GOOGLE_PROJECT_ID=${GOOGLE_PROJECT_ID},_BUCKET=${BUCKET} \
                                      --timeout=180m
 done
diff --git a/scripts/build_images.sh b/scripts/build_images.sh
index 013a9612..f04d906a 100755
--- a/scripts/build_images.sh
+++ b/scripts/build_images.sh
@@ -49,7 +49,7 @@ do
     > $(dirname ${TEMPLATE})/$(basename -s .in ${TEMPLATE})
 done
 
-gcloud container builds submit . \
+gcloud builds submit . \
   --config "${CLOUDBUILD_CONFIG}" \
   --timeout 3600 \
   --substitutions _GOOGLE_PROJECT_ID=$GOOGLE_PROJECT_ID,_TAG=$TAG,_RUNTIME_DISTRIBUTION=$RUNTIME_DISTRIBUTION
@@ -72,7 +72,7 @@ else
     echo "Using test build pipeline:"
     cat builder/php-test.yaml
 
-    gcloud container builds submit . \
+    gcloud builds submit . \
       --config integration-tests.yaml \
       --timeout 3600 \
       --substitutions _GOOGLE_PROJECT_ID=$GOOGLE_PROJECT_ID,_TAG=$TAG,_SERVICE_ACCOUNT_JSON=$SERVICE_ACCOUNT_JSON,_E2E_PROJECT_ID=$E2E_PROJECT_ID,_RUNTIME_BUILDER_ROOT=file:///workspace/builder/,_TEST_VM_IMAGE=
diff --git a/scripts/run_acceptance_tests.sh b/scripts/run_acceptance_tests.sh
index 310338f5..9961c3b4 100755
--- a/scripts/run_acceptance_tests.sh
+++ b/scripts/run_acceptance_tests.sh
@@ -49,7 +49,7 @@ then
     E2E_PROJECT_ID=$GOOGLE_PROJECT_ID
 fi
 
-gcloud container builds submit . \
+gcloud builds submit . \
   --config integration-tests.yaml \
   --timeout 3600 \
   --substitutions _GOOGLE_PROJECT_ID=$GOOGLE_PROJECT_ID,_TAG=$TAG,_SERVICE_ACCOUNT_JSON=$SERVICE_ACCOUNT_JSON,_E2E_PROJECT_ID=$E2E_PROJECT_ID,_TEST_VM_IMAGE=${TEST_VM_IMAGE},_RUNTIME_BUILDER_ROOT=