Merge pull request #362 from continuouspipe/feature/has-composer-package

Add a has_composer_package function to php images

Author: andytson-inviqa

php-apache/Dockerfile

@@ -17,6 +17,7 @@ RUN echo 'deb http://s3-eu-west-1.amazonaws.com/qafoo-profiler/packages debian m
     apache2-utils \
     curl \
     git \
+    jq \
     "libapache2-mod-php$PHP_VERSION" \
     php-apcu \
     php-imagick \

php-apache/usr/local/share/php/common_functions.sh

@@ -27,3 +27,12 @@ do_composer() {
 do_composer_postinstall_scripts() {
   as_code_owner 'composer run-script post-install-cmd'
 }
+
+has_composer_package() (
+  set -e
+  if [ ! -f "composer.lock" ]; then
+    return
+  fi
+
+  is_true "$(jq -c '(.packages + .["packages-dev"])[] | select(.name == "'"$1"'") | has("name")' composer.lock)"
+)

php-nginx/Dockerfile

@@ -14,6 +14,7 @@ RUN echo 'deb http://s3-eu-west-1.amazonaws.com/qafoo-profiler/packages debian m
  && apt-get update -qq \
  && DEBIAN_FRONTEND=noninteractive apt-get -qq -y --no-install-recommends install \
     awscli \
+    jq \
     nginx \
     php-apcu \
     php-imagick \

php-nginx/usr/local/share/php/common_functions.sh

@@ -27,3 +27,12 @@ do_composer() {
 do_composer_postinstall_scripts() {
   as_code_owner 'composer run-script post-install-cmd'
 }
+
+has_composer_package() (
+  set -e
+  if [ ! -f "composer.lock" ]; then
+    return
+  fi
+
+  is_true "$(jq -c '(.packages + .["packages-dev"])[] | select(.name == "'"$1"'") | has("name")' composer.lock)"
+)

symfony/README.md

@@ -70,6 +70,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_ENV | The Symfony env to use, when the app reads this variable | string | prod
 SYMFONY_MAJOR_VERSION | The major version of Symfony that will be used | 2, 3 | auto-detected based on location of console script
 SYMFONY_CONSOLE | The location of the Symfony console script | file path | auto-detected

symfony/usr/local/share/container/baseimage-30.sh

@@ -13,3 +13,13 @@ do_composer() {
   do_symfony_composer_inner
   do_symfony_app_permissions
 }
+
+alias_function do_development_start do_symfony_development_start_inner
+do_development_start() {
+  do_symfony_development_start_inner
+  do_database_build
+}
+
+do_migrate() {
+  do_database_build
+}

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

@@ -10,3 +10,4 @@ fi
 
 export SYMFONY_MAJOR_VERSION=${SYMFONY_MAJOR_VERSION:-${SYMFONY_MAJOR_VERSION_GUESS}}
 export SYMFONY_CONSOLE=${SYMFONY_CONSOLE:-${SYMFONY_CONSOLE_DEFAULT}}
+export SYMFONY_DOCTRINE_MODE=auto

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

@@ -32,12 +32,52 @@ do_symfony_app_permissions() {
   fi
 }
 
+
+symfony_doctrine_mode() {
+  case "$SYMFONY_DOCTRINE_MODE" in
+  auto)
+    if has_composer_package doctrine/doctrine-migrations-bundle; then
+      SYMFONY_DOCTRINE_MODE=migrations
+    elif has_composer_package doctrine/doctrine-bundle && has_composer_package doctrine/orm; then
+      SYMFONY_DOCTRINE_MODE=schema
+    else
+      SYMFONY_DOCTRINE_MODE=off
+    fi
+    ;;
+  ?*)
+    ;;
+  *)
+    SYMFONY_DOCTRINE_MODE=off
+    ;;
+  esac
+  export SYMFONY_DOCTRINE_MODE
+  echo "$SYMFONY_DOCTRINE_MODE"
+}
+
+uses_symfony_doctrine() {
+  [ "$(symfony_doctrine_mode)" != "off" ]
+}
+
+uses_symfony_doctrine_mode_schema() {
+  [ "$(symfony_doctrine_mode)" = "schema" ]
+}
+
+uses_symfony_doctrine_mode_migrations() {
+  [ "$(symfony_doctrine_mode)" = "migrations" ]
+}
+
 do_database_rebuild() {
-  do_symfony_console doctrine:database:drop --force >/dev/null || true
+  if uses_symfony_doctrine; then
+    do_symfony_console doctrine:database:drop --force >/dev/null || true
+  fi
   do_database_build
 }
 
 do_database_build() {
+  if ! uses_symfony_doctrine; then
+    return 0
+  fi
+
   # load the database if it doesn't exist
   set +e
   do_symfony_console doctrine:database:create >/dev/null
@@ -57,13 +97,20 @@ do_database_build() {
 }
 
 do_database_install() {
-  do_database_schema_create
-  do_database_migrations_mark_done
+  if uses_symfony_doctrine_mode_migrations; then
+    do_database_migrate
+  elif uses_symfony_doctrine_mode_schema; then
+    do_database_schema_create
+  fi
   do_database_fixtures
 }
 
 do_database_update() {
-  do_database_migrate
+  if uses_symfony_doctrine_mode_migrations; then
+    do_database_migrate
+  elif uses_symfony_doctrine_mode_schema; then
+    do_database_schema_update
+  fi
 }
 
 do_database_schema_create() {
@@ -87,7 +134,9 @@ do_cache_clear() {
 }
 
 do_database_fixtures() {
-  do_symfony_console doctrine:fixtures:load -n
+  if has_composer_package doctrine/doctrine-fixtures-bundle; then
+    do_symfony_console doctrine:fixtures:load -n
+  fi
 }
 
 do_symfony_build() {

ubuntu/16.04/usr/local/share/bootstrap/common_functions.sh

@@ -98,6 +98,24 @@ convert_to_boolean_string_zero_is_true() {
   fi
 }
 
+is_true() {
+  case "$1" in
+  true|1)
+    return 0;
+    ;;
+  esac
+  return 1;
+}
+
+is_false() {
+  case "$1" in
+  true|1)
+    return 0;
+    ;;
+  esac
+  return 1;
+}
+
 is_hem_project() {
   local RESULT=1
   if [ -f /app/tools/hem/config.yaml ] || [ -f /app/tools/hobo/config.yaml ]; then