Merge branch 'release/2.4.30' into craft-webpack

nystudio107 · Apr 5, 2021 · bb1a1c3 · bb1a1c3
2 parents 57fcd05 + e178c1d
commit bb1a1c3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # nystudio107/craft Change Log
 
+## 2.4.30 - 2021.04.05
+### Fixed
+* Fixed `make up` command by removing an errant `$`
+* Add `storage/config-deltas/` to prevent permissions issues
+
 ## 2.4.29 - 2021.03.25
 ### Added
 * Added `make clean` to the Makefile

diff --git a/Makefile b/Makefile
@@ -21,7 +21,7 @@ restoredb: up
 	cd scripts/ && ./docker_restore_db.sh \
 		$(filter-out $@,$(MAKECMDGOALS))
 up:
-	if [ ! "$$(docker ps -q -f name=$${CONTAINER})" ]; then \
+	if [ ! "$$(docker ps -q -f name=${CONTAINER})" ]; then \
         docker-compose up; \
     fi
 %:

diff --git a/cms/storage/config-deltas/.gitignore b/cms/storage/config-deltas/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore