Browse Source

Fix home path for M2 composer. Fix runtime owner on bin scripts.

Mark Shust 7 years ago
parent
commit
9d4b0f90a5

+ 1 - 1
compose/magento-1/bin/composer

@@ -1,2 +1,2 @@
 #!/bin/bash
-./bin/cli composer "$@"
+./bin/cli su -c "composer '$@'" -s /bin/bash app

+ 1 - 1
compose/magento-1/bin/mage

@@ -1,3 +1,3 @@
 #!/bin/bash
 [ -z "$1" ] && echo "Please specify a mage command (ex. cache:flush)" && exit
-./bin/cli ./mage "$@"
+./bin/cli su -c "./mage '$@'" -s /bin/bash app

+ 1 - 1
compose/magento-2/bin/composer

@@ -1,2 +1,2 @@
 #!/bin/bash
-./bin/cli composer "$@"
+./bin/cli su -c "composer '$@'" -s /bin/bash app

+ 1 - 1
compose/magento-2/bin/magento

@@ -1,2 +1,2 @@
 #!/bin/bash
-./bin/cli ./bin/magento "$@"
+./bin/cli su -c "./bin/magento '$@'" -s /bin/bash app

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

@@ -23,5 +23,3 @@ echo "Turning on developer mode.."
 ./bin/magento deploy:mode:set developer
 
 ./bin/magento indexer:reindex
-
-./bin/fixperms

+ 4 - 1
compose/magento-2/docker-compose-dev.yml

@@ -1,10 +1,13 @@
+# Mark Shust's Magento Docker Compose (https://github.com/markoshust/magento-docker)
+# Version 11.1.2
+
 version: "3"
 
 services:
   app:
     volumes: &appvolumes
       - magento222_appdata:/var/www/html:nocopy
-      - ~/.composer:/var/www/.composer
+      - ~/.composer:/var/www/html/var/composer_home
 
   phpfpm:
     volumes: *appvolumes

+ 1 - 1
compose/magento-2/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Magento Docker Compose (https://github.com/markoshust/magento-docker)
-# Version 11.0.0
+# Version 11.1.2
 
 version: "3"
 

+ 3 - 0
compose/magento-2/docker-sync.yml

@@ -1,3 +1,6 @@
+# Mark Shust's Magento Docker Compose (https://github.com/markoshust/magento-docker)
+# Version 11.1.2
+
 version: "2"
 
 syncs: