Merge pull request #401 from continuouspipe/feature/support-magento-2.2-workflow

Avoid conflicting with Magento 2.2 workflow

Author: fratcliffe

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

@@ -169,14 +169,7 @@ export MAGENTO_ENABLE_CONFIG_WEBSERVICE_CACHE
 MAGENTO_ENABLE_TARGET_RULE_CACHE=$(convert_to_boolean_string "${MAGENTO_ENABLE_TARGET_RULE_CACHE:-true}")
 export MAGENTO_ENABLE_TARGET_RULE_CACHE
 
-function detect_enterprise_edition() (
-  set +e
-  source /usr/local/share/php/common_functions.sh
-  if has_composer_package "magento/product-enterprise-edition"; then
-    echo 'true'
-  else
-    echo 'false'
-  fi
-)
-MAGENTO_ENTERPRISE_EDITION=$(convert_to_boolean_string "${MAGENTO_ENTERPRISE_EDITION:-$(detect_enterprise_edition)}")
+MAGENTO_ENTERPRISE_EDITION=$(convert_to_boolean_string "${MAGENTO_ENTERPRISE_EDITION:-$(run_return_boolean has_composer_package "magento/product-enterprise-edition")}")
 export MAGENTO_ENTERPRISE_EDITION
+
+export MAGENTO_VERSION="${MAGENTO_VERSION:-$(composer_package_version magento/product-community-edition | cut -d. -f1,2)}"

magento2/usr/local/share/magento2/magento_functions.sh

@@ -408,7 +408,16 @@ function do_magento_download_magerun2() {
   chmod +x /app/bin/n98-magerun2.phar
 }
 
+function remove_config_template() (
+  set +e
+  if dpkg --compare-versions "$MAGENTO_VERSION" ge 2.2; then
+    rm -f /etc/confd/conf.d/magento_config.php.toml /etc/confd/templates/magento/config.php.tmpl
+  fi
+)
+
 function do_magento2_templating() {
+  remove_config_template
+
   mkdir -p /app/app/etc/
   chown -R "${CODE_OWNER}:${CODE_GROUP}" /app/app/
 }