Merge branch 'release/1.0.38'

nystudio107 · Jan 8, 2022 · d07639f · d07639f
2 parents 5ea55d9 + 953afdb
commit d07639f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # nystudio107/plugindev Change Log
 
+## 1.0.38 - 2022.01.07
+### Fixed
+* Use `su-exec www-data` in the Makefile so `craft` and `composer` commands are not run as root
+
 ## 1.0.37 - 2021.12.25
 ### Fixed
 * Fix Composer [2.2.0 error](https://getcomposer.org/doc/06-config.md#allow-plugins) by adding `allow-plugins`

diff --git a/Makefile b/Makefile
@@ -7,10 +7,10 @@ clean:
 	docker-compose down -v
 	docker-compose up --build
 composer: up
-	docker exec -it ${CONTAINER} composer \
+	docker exec -it ${CONTAINER} su-exec www-data composer \
 		$(filter-out $@,$(MAKECMDGOALS))
 craft: up
-	docker exec -it ${CONTAINER} php craft \
+	docker exec -it ${CONTAINER} su-exec www-data php craft \
 		$(filter-out $@,$(MAKECMDGOALS))
 mysql: up
 	cp cms/config/_configs/mysql/db.php cms/config/db.php

diff --git a/cms/example.env b/cms/example.env
@@ -34,7 +34,3 @@ DBGP_IDEKEY=phpstorm
 # Plugin debug
 NYS_PLUGIN_DEVSERVER=1
 VITE_PLUGIN_DEVSERVER=1
-
-# Allow superuser in local dev
-CRAFT_ALLOW_SUPERUSER=1
-COMPOSER_ALLOW_SUPERUSER=1