Merge branch 'release/2.6.5' into devmode-vite

Author: Andrew Welch

CHANGELOG.md

@@ -1,5 +1,12 @@
 # nystudio107/devmode Change Log
 
+## 2.6.5 - 2022.05.04
+### Added
+* Determine the container name separator character by checking the Docker Compose API version at runtime
+* 
+### Changed
+* Updated to release version of Craft CMS 4
+
 ## 2.6.4 - 2022.05.02
 ### Fixed
 * Clean up initial check for `composer.lock` or `vendor/autoload.php` to ensure the first-time install is done

Makefile

@@ -1,24 +1,31 @@
-CONTAINER?=$(shell basename $(CURDIR))-php-1
-BUILDCHAIN?=$(shell basename $(CURDIR))-vite-1
+# Determine the docker compose API version to get the separator character
+VERSION?=$(shell docker-compose -v)
+ifneq (,$(findstring v2.,$(VERSION)))
+	SEPARATOR:=-
+else
+	SEPARATOR:=_
+endif
+CONTAINER?=$(shell basename $(CURDIR))$(SEPARATOR)php$(SEPARATOR)1
+BUILDCHAIN?=$(shell basename $(CURDIR))$(SEPARATOR)vite$(SEPARATOR)1
 
 .PHONY: build clean composer craft dev npm pulldb restoredb nuke ssh up
 
 build: up
-	docker exec -it ${BUILDCHAIN} npm run build
+	docker exec -it $(BUILDCHAIN) npm run build
 clean:
 	rm -f cms/composer.lock
 	rm -rf cms/vendor/
 	rm -f buildchain/package-lock.json
 	rm -rf buildchain/node_modules/
 composer: up
-	docker exec -it ${CONTAINER} su-exec www-data composer \
+	docker exec -it $(CONTAINER) su-exec www-data composer \
 		$(filter-out $@,$(MAKECMDGOALS))
 craft: up
-	docker exec -it ${CONTAINER} su-exec www-data php craft \
+	docker exec -it $(CONTAINER) su-exec www-data php craft \
 		$(filter-out $@,$(MAKECMDGOALS))
 dev: up
 npm: up
-	docker exec -it ${BUILDCHAIN} npm \
+	docker exec -it $(BUILDCHAIN) npm \
 		$(filter-out $@,$(MAKECMDGOALS))
 pulldb: up
 	cd scripts/ && ./docker_pull_db.sh
@@ -29,9 +36,9 @@ nuke: clean
 	docker-compose down -v
 	docker-compose up --build --force-recreate
 ssh:
-	docker exec -it ${CONTAINER} su-exec www-data /bin/sh
+	docker exec -it $(CONTAINER) su-exec www-data /bin/sh
 up:
-	if [ ! "$$(docker ps -q -f name=${CONTAINER})" ]; then \
+	if [ ! "$$(docker ps -q -f name=$(CONTAINER))" ]; then \
 		cp -n cms/example.env cms/.env; \
 		docker-compose up; \
     fi