Merge pull request #410 from continuouspipe/feature/symfony-wait-for-db

Ensure the database is available when doctrine database build runs

Author: andytson-inviqa

symfony/README.md

@@ -71,6 +71,7 @@ The following variables are supported
 Variable | Description | Expected values | Default
 --- | --- | --- | ----
 SYMFONY_DOCTRINE_MODE | Whether to use Doctrine migrations, schema update or nothing. Automatically detected based on installed composer packages by default | auto/migrations/schema/off | auto
+SYMFONY_DOCTRINE_WAIT_TIMEOUT | The maximum time to wait for the database to become available during the database build | time in seconds | 10
 SYMFONY_ENV | The Symfony env to use, when the app reads this variable | string | prod
 SYMFONY_FLEX | Whether the project uses the symfony/flex component and folder structure | true/false | autodetected based on whether in composer.lock
 SYMFONY_MAJOR_VERSION | The major version of Symfony that will be used | 2, 3 | auto-detected based on location of console script

symfony/usr/local/share/env/30-framework

@@ -5,6 +5,7 @@ export PHP_OPCACHE_MAX_ACCELERATED_FILES=${PHP_OPCACHE_MAX_ACCELERATED_FILES:-20
 export PHP_REALPATH_CACHE_SIZE=${PHP_REALPATH_CACHE_SIZE:-4096K}
 export PHP_REALPATH_CACHE_TTL=${PHP_REALPATH_CACHE_TTL:-600}
 export SYMFONY_DOCTRINE_MODE=auto
+export SYMFONY_DOCTRINE_WAIT_TIMEOUT="${SYMFONY_DOCTRINE_WAIT_TIMEOUT:-10}"
 SYMFONY_WEB_APP_ENV_REWRITE="$(convert_to_boolean_string "${SYMFONY_WEB_APP_ENV_REWRITE:-false}")"
 export SYMFONY_WEB_APP_ENV_REWRITE
 

symfony/usr/local/share/symfony/symfony_functions.sh

@@ -81,18 +81,15 @@ do_database_build() {
     return 0
   fi
 
-  # load the database if it doesn't exist
-  set +e
-  do_symfony_console doctrine:database:create >/dev/null
-  local DATABASE_EXISTED=$?
-  set -e
-
-  local QUERY_LINE_COUNT=0
-  if [ "$DATABASE_EXISTED" -eq 1 ]; then
-    QUERY_LINE_COUNT="$(do_symfony_console doctrine:query:sql 'SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = database()' | wc -l)"
-  fi
+  wait_for_remote_ports "${SYMFONY_DOCTRINE_WAIT_TIMEOUT}" "${DATABASE_HOST}:${DATABASE_PORT}"
+
+  # create the database if it doesn't exist
+  do_symfony_console doctrine:database:create --if-not-exists
+
+  local QUERY_LINE_COUNT
+  QUERY_LINE_COUNT="$(do_symfony_console doctrine:query:sql 'SELECT TABLE_NAME FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA = database()' | wc -l)"
 
-  if [ "$DATABASE_EXISTED" -ne 1 ] || [ "$QUERY_LINE_COUNT" -lt 3 ]; then
+  if [ "$QUERY_LINE_COUNT" -lt 3 ]; then
     do_database_install
   else
     do_database_update