Stop building debian packages (#447)

* Only build ubuntu images * Remove ubuntu test app with runtime_config: base_os: ubuntu16 * Build image as just php * Default runtime xenial in circle * Rename ubuntu folders * Remove ubuntu-php71 image from pipeline
GoogleCloudPlatform · Jun 4, 2018 · 1f30473 · 1f30473
1 parent 77dff6f
commit 1f30473
Show file tree

Hide file tree

Showing 904 changed files with 93 additions and 18,108 deletions.
diff --git a/builder/gen-dockerfile/src/Builder/GenFilesCommand.php b/builder/gen-dockerfile/src/Builder/GenFilesCommand.php
@@ -81,30 +81,6 @@ protected function configure()
                 InputOption::VALUE_REQUIRED,
                 'The PHP 56 base image of the Dockerfile'
             )
-            ->addOption(
-                'ubuntu-php72-image',
-                null,
-                InputOption::VALUE_REQUIRED,
-                'The PHP 72 ubuntu base image of the Dockerfile'
-            )
-            ->addOption(
-                'ubuntu-php71-image',
-                null,
-                InputOption::VALUE_REQUIRED,
-                'The PHP 71 ubuntu base image of the Dockerfile'
-            )
-            ->addOption(
-                'ubuntu-php70-image',
-                null,
-                InputOption::VALUE_REQUIRED,
-                'The PHP 70 ubuntu base image of the Dockerfile'
-            )
-            ->addOption(
-                'ubuntu-php56-image',
-                null,
-                InputOption::VALUE_REQUIRED,
-                'The PHP 56 ubuntu base image of the Dockerfile'
-            )
             ->addOption(
                 'workspace',
                 'w',

diff --git a/builder/gen-dockerfile/tests/GenFilesCommandTest.php b/builder/gen-dockerfile/tests/GenFilesCommandTest.php
@@ -80,10 +80,6 @@ public function testGenFilesCommand(
                     '--php70-image' => 'gcr.io/google-appengine/php70:latest',
                     '--php71-image' => 'gcr.io/google-appengine/php71:latest',
                     '--php72-image' => 'gcr.io/google-appengine/php72:latest',
-                    '--ubuntu-php56-image' => 'gcr.io/google-appengine/ubuntu-php56:latest',
-                    '--ubuntu-php70-image' => 'gcr.io/google-appengine/ubuntu-php70:latest',
-                    '--ubuntu-php71-image' => 'gcr.io/google-appengine/ubuntu-php71:latest',
-                    '--ubuntu-php72-image' => 'gcr.io/google-appengine/ubuntu-php72:latest',
                 ];
         }
         if ($expectedException !== null) {
@@ -243,58 +239,6 @@ public function dataProvider()
                  "DETECTED_PHP_VERSION='7.2' \n"
                 ]
             ],
-            [
-                // Ubuntu PHP 5.6
-                __DIR__ . '/test_data/ubuntu-php56',
-                null,
-                '',
-                '/app',
-                'added by the php runtime builder',
-                'gcr.io/google-appengine/ubuntu-php56:latest',
-                ["COMPOSER_FLAGS='--no-dev --prefer-dist' \\\n",
-                 "FRONT_CONTROLLER_FILE='index.php' \\\n",
-                 "DETECTED_PHP_VERSION='5.6' \n"
-                ]
-            ],
-            [
-                // PHP 7.0
-                __DIR__ . '/test_data/ubuntu-php70',
-                null,
-                '',
-                '/app',
-                'added by the php runtime builder',
-                'gcr.io/google-appengine/ubuntu-php70:latest',
-                ["COMPOSER_FLAGS='--no-dev --prefer-dist' \\\n",
-                 "FRONT_CONTROLLER_FILE='index.php' \\\n",
-                 "DETECTED_PHP_VERSION='7.0' \n"
-                ]
-            ],
-            [
-                // PHP 7.1
-                __DIR__ . '/test_data/ubuntu-php71',
-                null,
-                '',
-                '/app',
-                'added by the php runtime builder',
-                'gcr.io/google-appengine/ubuntu-php71:latest',
-                ["COMPOSER_FLAGS='--no-dev --prefer-dist' \\\n",
-                 "FRONT_CONTROLLER_FILE='index.php' \\\n",
-                 "DETECTED_PHP_VERSION='7.1' \n"
-                ]
-            ],
-            [
-                // PHP 7.2
-                __DIR__ . '/test_data/ubuntu-php72',
-                null,
-                '',
-                '/app',
-                'added by the php runtime builder',
-                'gcr.io/google-appengine/ubuntu-php72:latest',
-                ["COMPOSER_FLAGS='--no-dev --prefer-dist' \\\n",
-                 "FRONT_CONTROLLER_FILE='index.php' \\\n",
-                 "DETECTED_PHP_VERSION='7.2' \n"
-                ]
-            ],
             [
                 // values on env_variables
                 __DIR__ . '/test_data/values_only_on_env',

diff --git a/builder/gen-dockerfile/tests/test_data/ubuntu-php56/app.yaml b/builder/gen-dockerfile/tests/test_data/ubuntu-php56/app.yaml
diff --git a/builder/gen-dockerfile/tests/test_data/ubuntu-php56/composer.json b/builder/gen-dockerfile/tests/test_data/ubuntu-php56/composer.json
diff --git a/builder/gen-dockerfile/tests/test_data/ubuntu-php70/app.yaml b/builder/gen-dockerfile/tests/test_data/ubuntu-php70/app.yaml
diff --git a/builder/gen-dockerfile/tests/test_data/ubuntu-php70/composer.json b/builder/gen-dockerfile/tests/test_data/ubuntu-php70/composer.json
diff --git a/builder/gen-dockerfile/tests/test_data/ubuntu-php71/app.yaml b/builder/gen-dockerfile/tests/test_data/ubuntu-php71/app.yaml
diff --git a/builder/gen-dockerfile/tests/test_data/ubuntu-php71/composer.json b/builder/gen-dockerfile/tests/test_data/ubuntu-php71/composer.json
diff --git a/builder/gen-dockerfile/tests/test_data/ubuntu-php72/app.yaml b/builder/gen-dockerfile/tests/test_data/ubuntu-php72/app.yaml
diff --git a/builder/gen-dockerfile/tests/test_data/ubuntu-php72/composer.json b/builder/gen-dockerfile/tests/test_data/ubuntu-php72/composer.json
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: ['--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', '--ubuntu-php72-image', 'gcr.io/google-appengine/ubuntu-php72:latest', '--ubuntu-php71-image', 'gcr.io/google-appengine/ubuntu-php71:latest', '--ubuntu-php70-image', 'gcr.io/google-appengine/ubuntu-php70:latest', '--ubuntu-php56-image', 'gcr.io/google-appengine/ubuntu-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/circle.yml b/circle.yml
@@ -12,7 +12,7 @@ machine:
     GOOGLE_PROJECT_ID: php-mvm-a
     E2E_PROJECT_ID: php-mvm-a
     TAG: circle-${CIRCLE_BUILD_NUM}
-    RUNTIME_DISTRIBUTION: gcp-php-runtime-jessie-unstable
+    RUNTIME_DISTRIBUTION: gcp-php-runtime-xenial-unstable
     BUILDER_TARGET_IMAGE: gcr.io/${GOOGLE_PROJECT_ID}/php
     RUN_E2E_TESTS: true
 

diff --git a/cloudbuild-ubuntu.yaml b/cloudbuild-ubuntu.yaml
@@ -7,80 +7,80 @@ steps:
 
   # php-base
   - name: gcr.io/cloud-builders/docker
-    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-base:$_TAG', '--build-arg', 'RUNTIME_DISTRIBUTION=$_RUNTIME_DISTRIBUTION', '.']
-    dir: ubuntu-php-base
+    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-base:$_TAG', '--build-arg', 'RUNTIME_DISTRIBUTION=$_RUNTIME_DISTRIBUTION', '.']
+    dir: php-base
     waitFor: ['-']
     id: php-base
   - name: gcr.io/gcp-runtimes/structure_test
-    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-base:$_TAG', '--config', '/workspace/ubuntu-php-base/ubuntu-php-base.yaml', '-v']
+    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-base:$_TAG', '--config', '/workspace/php-base/php-base.yaml', '-v']
     waitFor: ['php-base']
-    id: ubuntu-php-base-structure
+    id: php-base-structure
 
   # php72
   - name: gcr.io/cloud-builders/docker
-    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php72:$_TAG', '--build-arg', 'PHP_VERSION=7.2', '.']
+    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php72:$_TAG', '--build-arg', 'PHP_VERSION=7.2', '.']
     dir: php-versioned
     waitFor: ['php-base']
     id: php72
   - name: gcr.io/gcp-runtimes/structure_test
-    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php72:$_TAG', '--config', '/workspace/php-versioned/php72.yaml', '-v']
+    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/php72:$_TAG', '--config', '/workspace/php-versioned/php72.yaml', '-v']
     waitFor: ['php72']
     id: php72-structure
 
   # php71
   - name: gcr.io/cloud-builders/docker
-    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php71:$_TAG', '--build-arg', 'PHP_VERSION=7.1', '.']
+    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php71:$_TAG', '--build-arg', 'PHP_VERSION=7.1', '.']
     dir: php-versioned
     waitFor: ['php-base']
     id: php71
   - name: gcr.io/gcp-runtimes/structure_test
-    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php71:$_TAG', '--config', '/workspace/php-versioned/php71.yaml', '-v']
+    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/php71:$_TAG', '--config', '/workspace/php-versioned/php71.yaml', '-v']
     waitFor: ['php71']
     id: php71-structure
 
   # php70
   - name: gcr.io/cloud-builders/docker
-    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php70:$_TAG', '--build-arg', 'PHP_VERSION=7.0', '.']
+    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php70:$_TAG', '--build-arg', 'PHP_VERSION=7.0', '.']
     dir: php-versioned
     waitFor: ['php-base']
     id: php70
   - name: gcr.io/gcp-runtimes/structure_test
-    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php70:$_TAG', '--config', '/workspace/php-versioned/php70.yaml', '-v']
+    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/php70:$_TAG', '--config', '/workspace/php-versioned/php70.yaml', '-v']
     waitFor: ['php70']
     id: php70-structure
 
   # php56
   - name: gcr.io/cloud-builders/docker
-    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php56:$_TAG', '--build-arg', 'PHP_VERSION=5.6', '.']
+    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php56:$_TAG', '--build-arg', 'PHP_VERSION=5.6', '.']
     dir: php-versioned
     waitFor: ['php-base']
     id: php56
   - name: gcr.io/gcp-runtimes/structure_test
-    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php56:$_TAG', '--config', '/workspace/php-versioned/php56.yaml', '-v']
+    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/php56:$_TAG', '--config', '/workspace/php-versioned/php56.yaml', '-v']
     waitFor: ['php56']
     id: php56-structure
 
   # test runner
   - name: gcr.io/cloud-builders/docker
-    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-test-runner:$_TAG', '.']
+    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG', '.']
     dir: cloudbuild-test-runner
     waitFor: ['php56-structure']
     id: test-runner
 
   # base tests
   - name: gcr.io/cloud-builders/docker
-    args: ['run', '-v', '/workspace/ubuntu-php-base:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-test-runner:$_TAG']
+    args: ['run', '-v', '/workspace/php-base:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG']
     id: php-base-tests
     waitFor: ['test-runner', 'php-base']
 
   # php-onbuild
   - name: gcr.io/cloud-builders/docker
-    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php:$_TAG', '.']
+    args: ['build', '-t', 'gcr.io/${_GOOGLE_PROJECT_ID}/php:$_TAG', '.']
     dir: php-onbuild
     waitFor: ['php71']
     id: php-onbuild
   - name: gcr.io/gcp-runtimes/structure_test
-    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php:$_TAG', '--config', '/workspace/php-onbuild/php.yaml', '-v']
+    args: ['-i', 'gcr.io/${_GOOGLE_PROJECT_ID}/php:$_TAG', '--config', '/workspace/php-onbuild/php.yaml', '-v']
     waitFor: ['php-onbuild']
     id: php-onbuild-structure
 
@@ -109,7 +109,7 @@ steps:
     waitFor: ['php56-build', 'test-network']
     id: php56-app
   - name: gcr.io/cloud-builders/docker
-    args: ['run', '--net=nw_$_TAG', '-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-test-runner:$_TAG', '/workspace/testapps/php56']
+    args: ['run', '--net=nw_$_TAG', '-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG', '/workspace/testapps/php56']
     waitFor: ['php56-app', 'test-runner']
     id: php56-test
 
@@ -127,7 +127,7 @@ steps:
     waitFor: ['php56-custom-build', 'test-network']
     id: php56-custom-app
   - name: gcr.io/cloud-builders/docker
-    args: ['run', '--net=nw_$_TAG','-v', '/workspace:/workspace', '--env', 'EXTRA_COMPOSER_FLAGS=--ignore-platform-reqs', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-test-runner:$_TAG', '/workspace/testapps/php56_custom']
+    args: ['run', '--net=nw_$_TAG','-v', '/workspace:/workspace', '--env', 'EXTRA_COMPOSER_FLAGS=--ignore-platform-reqs', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG', '/workspace/testapps/php56_custom']
     waitFor: ['php56-custom-app', 'test-runner']
     id: php56-custom-test
 
@@ -142,7 +142,7 @@ steps:
     waitFor: ['php56-custom-configs-build', 'test-network']
     id: php56-custom-configs-app
   - name: gcr.io/cloud-builders/docker
-    args: ['run', '--net=nw_$_TAG', '-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-test-runner:$_TAG', '/workspace/testapps/php56_custom_configs']
+    args: ['run', '--net=nw_$_TAG', '-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG', '/workspace/testapps/php56_custom_configs']
     waitFor: ['php56-custom-configs-app', 'test-runner']
     id: php56-custom-configs-test
 
@@ -168,7 +168,7 @@ steps:
     args: ['run', '--net=nw_$_TAG', '--name=php56-nginx-conf', '-d', 'gcr.io/${_GOOGLE_PROJECT_ID}/php56-nginx-conf:$_TAG']
     waitFor: ['php56-nginx-conf-build', 'test-network']
   - name: gcr.io/cloud-builders/docker
-    args: ['run', '--net=nw_$_TAG', '-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-test-runner:$_TAG', '/workspace/testapps/php56_nginx_conf']
+    args: ['run', '--net=nw_$_TAG', '-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG', '/workspace/testapps/php56_nginx_conf']
     waitFor: ['php56-nginx-conf-build', 'test-runner']
     id: php56-nginx-conf-test
 
@@ -186,7 +186,7 @@ steps:
     waitFor: ['php70-custom-build', 'test-network']
     id: php70-custom-app
   - name: gcr.io/cloud-builders/docker
-    args: ['run', '--net=nw_$_TAG','-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-test-runner:$_TAG', '/workspace/testapps/php70_custom/tests']
+    args: ['run', '--net=nw_$_TAG','-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG', '/workspace/testapps/php70_custom/tests']
     waitFor: ['php70-custom-app', 'test-runner']
     id: php70-custom-test
 
@@ -216,7 +216,7 @@ steps:
     waitFor: ['php71-custom-build', 'test-network']
     id: php71-custom-app
   - name: gcr.io/cloud-builders/docker
-    args: ['run', '--net=nw_$_TAG','-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-test-runner:$_TAG', '/workspace/testapps/php71_custom/tests']
+    args: ['run', '--net=nw_$_TAG','-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG', '/workspace/testapps/php71_custom/tests']
     waitFor: ['php71-custom-app', 'test-runner']
     id: php71-custom-test
 
@@ -234,7 +234,7 @@ steps:
     waitFor: ['php72-custom-build', 'test-network']
     id: php72-custom-app
   - name: gcr.io/cloud-builders/docker
-    args: ['run', '--net=nw_$_TAG','-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-test-runner:$_TAG', '/workspace/testapps/php72_custom/tests']
+    args: ['run', '--net=nw_$_TAG','-v', '/workspace:/workspace', 'gcr.io/${_GOOGLE_PROJECT_ID}/php-test-runner:$_TAG', '/workspace/testapps/php72_custom/tests']
     waitFor: ['php72-custom-app', 'test-runner']
     id: php72-custom-test
 
@@ -275,10 +275,10 @@ steps:
     id: php72-extensions-legacy-test
 
 images:
-  - gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-base:$_TAG
-  - gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php:$_TAG
-  - gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php72:$_TAG
-  - gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php71:$_TAG
-  - gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php70:$_TAG
-  - gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php56:$_TAG
-  - gcr.io/${_GOOGLE_PROJECT_ID}/ubuntu-php-test-runner:$_TAG
+  - gcr.io/${_GOOGLE_PROJECT_ID}/php-base:$_TAG
+  - gcr.io/${_GOOGLE_PROJECT_ID}/php:$_TAG
+  - gcr.io/${_GOOGLE_PROJECT_ID}/php72:$_TAG
+  - 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-test-runner:$_TAG