Merge pull request #372 from continuouspipe/feature/fix-magento2-reliance-on-inner-function

kierenevans · web-flow · commit 885eccfea668 · 2017-08-22T11:25:45.000+01:00
Reinstate the full path for development_start
diff --git a/magento2/usr/local/share/container/baseimage-30.sh b/magento2/usr/local/share/container/baseimage-30.sh
@@ -9,9 +9,9 @@ if [ "$IMAGE_VERSION" -ge 2 ]; then
     PRODUCTION_ENVIRONMENT="$BUILD_PRODUCTION_ENVIRONMENT" MAGENTO_MODE="$BUILD_MAGENTO_MODE" DEVELOPMENT_MODE="$BUILD_DEVELOPMENT_MODE" do_magento2_build
   }
 
+  alias_function do_development_start do_magento2_development_start_inner
   do_development_start() {
-    do_php_nginx_development_start_inner
-    do_composer
+    do_magento2_development_start_inner
     do_magento2_development_build
   }
 

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ if [ "$IMAGE_VERSION" -ge 2 ]; then`
`9`	`9`	`PRODUCTION_ENVIRONMENT="$BUILD_PRODUCTION_ENVIRONMENT" MAGENTO_MODE="$BUILD_MAGENTO_MODE" DEVELOPMENT_MODE="$BUILD_DEVELOPMENT_MODE" do_magento2_build`
`10`	`10`	`}`
`11`	`11`
	`12`	`+ alias_function do_development_start do_magento2_development_start_inner`
`12`	`13`	`do_development_start() {`
`13`		`- do_php_nginx_development_start_inner`
`14`		`- do_composer`
	`14`	`+ do_magento2_development_start_inner`
`15`	`15`	`do_magento2_development_build`
`16`	`16`	`}`
`17`	`17`