Added a missing composer entry for specifying the PHP version (#244)

* Added a missing composer entry for specifying the PHP version * Added a timeout for gcloud container builds
GoogleCloudPlatform · Apr 10, 2017 · 4999cd2 · 4999cd2
1 parent 2b841e2
commit 4999cd2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/scripts/build_images.sh b/scripts/build_images.sh
@@ -57,7 +57,7 @@ build_image () {
     fi
     envsubst < "${SRC_DIR}/cloudbuild.yaml.in" > "${SRC_DIR}/cloudbuild.test.yaml"
     gcloud -q container builds submit "${SRC_DIR}" \
-      --config "${SRC_DIR}"/cloudbuild.test.yaml
+      --config "${SRC_DIR}"/cloudbuild.test.yaml --timeout 3600
 }
 
 build_image php-nginx php-nginx

diff --git a/testapps/php56_custom_configs/composer.json b/testapps/php56_custom_configs/composer.json
@@ -1,4 +1,7 @@
 {
+    "require": {
+        "php": "^5.6"
+    },
     "require-dev": {
         "guzzlehttp/guzzle": "~6.0",
         "symfony/browser-kit": "~2"