Browse Source

Revert "Reverted fix for #135 as it caused composer.json dupe key val in 2.3.1"

This reverts commit bd7dd32c943c73657fbb7468f5b382b8dc26a70e.
Mark Shust 6 years ago
parent
commit
7eed8b3e0c
1 changed files with 4 additions and 0 deletions
  1. 4 0
      compose/magento-2/bin/setup

+ 4 - 0
compose/magento-2/bin/setup

@@ -3,6 +3,10 @@ BASE_URL=${1:-magento2.test}
 
 bin/stop
 
+# get rid of vertex/module-tax, not required and causes checksum errors on composer install
+# https://github.com/markshust/docker-magento/issues/135
+sed -e 's/"conflict": {/"replace": { "vertex\/module-tax": "*" },\ "conflict": {/' src/composer.json > composer.json && mv composer.json src/composer.json
+
 docker-compose -f docker-compose.yml up -d
 sleep 1 #Ensure containers are started...