Skip to content

Commit ece3a24

Browse files
kierenevansfratcliffe
authored andcommitted
Magento 2.2 workflow has app/etc/config.php committed to the repository. Don't overwrite this with a template.
1 parent 8d012e4 commit ece3a24

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,3 +180,5 @@ function detect_enterprise_edition() (
180180
)
181181
MAGENTO_ENTERPRISE_EDITION=$(convert_to_boolean_string "${MAGENTO_ENTERPRISE_EDITION:-$(detect_enterprise_edition)}")
182182
export MAGENTO_ENTERPRISE_EDITION
183+
184+
export MAGENTO_VERSION="${MAGENTO_VERSION:-2.1}"

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,10 @@ function do_magento_download_magerun2() {
409409
}
410410

411411
function do_magento2_templating() {
412+
if [ "$MAGENTO_VERSION" != "2.0" ] && [ "$MAGENTO_VERSION" != "2.1" ]; then
413+
rm -f /etc/confd/conf.d/magento_config.php.toml /etc/confd/templates/magento/config.php.tmpl
414+
fi
415+
412416
mkdir -p /app/app/etc/
413417
chown -R "${CODE_OWNER}:${CODE_GROUP}" /app/app/
414418
}

0 commit comments

Comments
 (0)