Adding PHP 7.2 base image (#381)

GoogleCloudPlatform · Oct 25, 2017 · 9b1b55f · 9b1b55f
1 parent 6016916
commit 9b1b55f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/builder/gen-dockerfile/src/Builder/GenFilesCommand.php b/builder/gen-dockerfile/src/Builder/GenFilesCommand.php
@@ -60,6 +60,12 @@ protected function configure()
         $this
             ->setName('create')
             ->setDescription('Create Dockerfile and .dockerignore file')
+            ->addOption(
+                'php72-image',
+                null,
+                InputOption::VALUE_REQUIRED,
+                'The PHP 72 base image of the Dockerfile'
+            )
             ->addOption(
                 'php71-image',
                 null,
@@ -121,6 +127,9 @@ protected function initialize(InputInterface $input, OutputInterface $output)
         } elseif (substr($version, 0, 3) === '7.0') {
             $this->baseImage = $input->getOption('php70-image');
             $this->detectedPhpVersion = '7.0';
+        } elseif (substr($version, 0, 3) === '7.2') {
+            $this->baseImage = $input->getOption('php72-image');
+            $this->detectedPhpVersion = '7.2';
         } else {
             $this->baseImage = $input->getOption('php71-image');
             $this->detectedPhpVersion = '7.1';

diff --git a/builder/php-latest.yaml b/builder/php-latest.yaml
@@ -1,6 +1,6 @@
 steps:
   - name: 'gcr.io/gcp-runtimes/php/gen-dockerfile:latest'
-    args: ['--php71-image', 'gcr.io/google-appengine/php71:latest', '--php70-image', 'gcr.io/google-appengine/php70:latest', '--php56-image', 'gcr.io/google-appengine/php56:latest']
+    args: ['--php72-image', 'gcr.io/google-appengine/php72:latest', '--php71-image', 'gcr.io/google-appengine/php71:latest', '--php70-image', 'gcr.io/google-appengine/php70:latest', '--php56-image', 'gcr.io/google-appengine/php56:latest']
   - name: 'gcr.io/cloud-builders/docker:latest'
     args: ['build', '-t', '$_OUTPUT_IMAGE', '--network=cloudbuild', '.']
 images:

diff --git a/php-base/build-scripts/install_extensions.php b/php-base/build-scripts/install_extensions.php
@@ -81,9 +81,9 @@ class InstallExtensions
         'couchbase' => ['5.6'],
         'ds' => ['5.6'],
         'lua' => ['5.6'],
-        'memcache' => ['7.0', '7.1'],
+        'memcache' => ['7.0', '7.1', '7.2'],
         'opencensus' => ['5.6'],
-        'phalcon' => ['7.1'],
+        'phalcon' => ['7.1', '7.2'],
         'v8js' => ['5.6'],
         'vips' => ['5.6'],
         'yaconf' => ['5.6']