Renamed the builder pipeline. (#260)

* Renamed the builder pipeline. * Renamed the builder pipeline in the builder definition too.
GoogleCloudPlatform · Apr 20, 2017 · 2c0836c · 2c0836c
1 parent d564031
commit 2c0836c
Show file tree

Hide file tree

Showing 25 changed files with 7 additions and 7 deletions.
diff --git a/builder/create-dockerfile/Dockerfile.in → builder/gen-dockerfile/Dockerfile.in b/builder/create-dockerfile/Dockerfile.in → builder/gen-dockerfile/Dockerfile.in
diff --git a/builder/create-dockerfile/cloudbuild.yaml.in → builder/gen-dockerfile/cloudbuild.yaml.in b/builder/create-dockerfile/cloudbuild.yaml.in → builder/gen-dockerfile/cloudbuild.yaml.in
diff --git a/builder/create-dockerfile/composer.json → builder/gen-dockerfile/composer.json b/builder/create-dockerfile/composer.json → builder/gen-dockerfile/composer.json
diff --git a/builder/create-dockerfile/composer.lock → builder/gen-dockerfile/composer.lock b/builder/create-dockerfile/composer.lock → builder/gen-dockerfile/composer.lock
diff --git a/builder/create-dockerfile/entrypoint.sh → builder/gen-dockerfile/entrypoint.sh b/builder/create-dockerfile/entrypoint.sh → builder/gen-dockerfile/entrypoint.sh
diff --git a/builder/create-dockerfile/errors.ini → builder/gen-dockerfile/errors.ini b/builder/create-dockerfile/errors.ini → builder/gen-dockerfile/errors.ini
diff --git a/builder/create-dockerfile/phpunit.xml.dist → builder/gen-dockerfile/phpunit.xml.dist b/builder/create-dockerfile/phpunit.xml.dist → builder/gen-dockerfile/phpunit.xml.dist
diff --git a/builder/create-dockerfile/src/GenFiles.php → builder/gen-dockerfile/src/GenFiles.php b/builder/create-dockerfile/src/GenFiles.php → builder/gen-dockerfile/src/GenFiles.php
diff --git a/...eate-dockerfile/src/create_dockerfile.php → .../gen-dockerfile/src/create_dockerfile.php b/...eate-dockerfile/src/create_dockerfile.php → .../gen-dockerfile/src/create_dockerfile.php
diff --git a/...-dockerfile/src/templates/Dockerfile.twig → ...-dockerfile/src/templates/Dockerfile.twig b/...-dockerfile/src/templates/Dockerfile.twig → ...-dockerfile/src/templates/Dockerfile.twig
diff --git a/...ockerfile/src/templates/dockerignore.tmpl → ...ockerfile/src/templates/dockerignore.tmpl b/...ockerfile/src/templates/dockerignore.tmpl → ...ockerfile/src/templates/dockerignore.tmpl
diff --git a/.../create-dockerfile/tests/GenFilesTest.php → ...der/gen-dockerfile/tests/GenFilesTest.php b/.../create-dockerfile/tests/GenFilesTest.php → ...der/gen-dockerfile/tests/GenFilesTest.php
diff --git a/...der/create-dockerfile/tests/bootstrap.php → builder/gen-dockerfile/tests/bootstrap.php b/...der/create-dockerfile/tests/bootstrap.php → builder/gen-dockerfile/tests/bootstrap.php
diff --git a/...le/tests/test_data/different_yaml/my.yaml → ...le/tests/test_data/different_yaml/my.yaml b/...le/tests/test_data/different_yaml/my.yaml → ...le/tests/test_data/different_yaml/my.yaml
diff --git a/...ckerfile/tests/test_data/docroot/app.yaml → ...ckerfile/tests/test_data/docroot/app.yaml b/...ckerfile/tests/test_data/docroot/app.yaml → ...ckerfile/tests/test_data/docroot/app.yaml
diff --git a/...e/tests/test_data/has_files/.dockerignore → ...e/tests/test_data/has_files/.dockerignore b/...e/tests/test_data/has_files/.dockerignore → ...e/tests/test_data/has_files/.dockerignore
diff --git a/...file/tests/test_data/has_files/Dockerfile → ...file/tests/test_data/has_files/Dockerfile b/...file/tests/test_data/has_files/Dockerfile → ...file/tests/test_data/has_files/Dockerfile
diff --git a/...erfile/tests/test_data/has_files/app.yaml → ...erfile/tests/test_data/has_files/app.yaml b/...erfile/tests/test_data/has_files/app.yaml → ...erfile/tests/test_data/has_files/app.yaml
diff --git a/...kerfile/tests/test_data/simplest/app.yaml → ...kerfile/tests/test_data/simplest/app.yaml b/...kerfile/tests/test_data/simplest/app.yaml → ...kerfile/tests/test_data/simplest/app.yaml
diff --git a/builder/php-latest.yaml b/builder/php-latest.yaml
@@ -1,5 +1,5 @@
 steps:
-  - name: 'gcr.io/gcp-runtimes/php/create-dockerfile:latest'
+  - name: 'gcr.io/gcp-runtimes/php/gen-dockerfile:latest'
   - name: 'gcr.io/cloud-builders/docker:latest'
     args: ['build', '-t', '$_OUTPUT_IMAGE', '.']
 images:

diff --git a/php-nginx/composer.sh b/php-nginx/composer.sh
@@ -74,7 +74,7 @@ EOF
     rm -rf ${APP_DIR}/vendor
 
     # Auto install extensions
-    php -d auto_prepend_file='' /tmp/install_extensions.php ${APP_DIR}/composer.json ${PHP_DIR}/lib/conf.d/extensions.ini ${PHP_VERSION}
+    php /tmp/install_extensions.php ${APP_DIR}/composer.json ${PHP_DIR}/lib/conf.d/extensions.ini ${PHP_VERSION}
 
     # Run Composer.
     cd ${APP_DIR} && \

diff --git a/php-nginx/entrypoint.sh b/php-nginx/entrypoint.sh
@@ -133,7 +133,7 @@ if [ -x "${PHP56_DIR}/bin/php56-enmod" ]; then
 fi
 
 # Whitelist functions
-${PHP_DIR}/bin/php /whitelist_functions.php
+${PHP_DIR}/bin/php -d auto_prepend_file='' /whitelist_functions.php
 
 # Remove loose php-cli.ini
 rm /opt/php/lib/php-cli.ini

diff --git a/scripts/build_images.sh b/scripts/build_images.sh
@@ -71,7 +71,7 @@ build_image php70_custom testapps/php70_custom
 build_image php70_extensions testapps/php70_extensions
 build_image php71_custom testapps/php71_custom
 build_image php71_extensions testapps/php71_extensions
-build_image create-dockerfile builder/create-dockerfile
+build_image php/gen-dockerfile builder/gen-dockerfile
 
 if [ -z "${RUN_E2E_TESTS}" ]; then
     echo 'E2E test skipped'

diff --git a/scripts/run_builder_test.sh b/scripts/run_builder_test.sh
@@ -26,7 +26,7 @@ if [ -z "${GOOGLE_PROJECT_ID}" ]; then
 fi
 
 # Export some image names
-export CREATE_DOCKERFILE="gcr.io/${GOOGLE_PROJECT_ID}/create-dockerfile:${TAG}"
+export GEN_DOCKERFILE="gcr.io/${GOOGLE_PROJECT_ID}/php/gen-dockerfile:${TAG}"
 export TEST_RUNNER="gcr.io/${GOOGLE_PROJECT_ID}/php-test-runner:${TAG}"
 
 SRC_TMP=$(mktemp -d)
@@ -35,7 +35,7 @@ SRC_DIR="${SRC_TMP}/${DIR}"
 mkdir -p $(dirname ${SRC_DIR})
 cp -R "${DIR}" "${SRC_DIR}"
 
-envsubst '{$CREATE_DOCKERFILE},${TEST_RUNNER}' \
+envsubst '{$GEN_DOCKERFILE},${TEST_RUNNER}' \
          < "${SRC_DIR}/cloudbuild.yaml.in" \
          > "${SRC_DIR}/cloudbuild.yaml"
 

diff --git a/testapps/builder_test/cloudbuild.yaml.in b/testapps/builder_test/cloudbuild.yaml.in
@@ -1,3 +1,3 @@
 steps:
-  - name: '${CREATE_DOCKERFILE}'
+  - name: '${GEN_DOCKERFILE}'
   - name: '${TEST_RUNNER}'