[compose.yml,Makefile] docker レガシーコマンドから移行

[compose.yml]
  - docker-compose.ymlからcompose.ymlに変更しました
  - これはCompose仕様が Docker社から独立し、OCIの一部となったことを反映しています
  - 別のオーケストレーションツールが認識しないことがありますため将来的に変更としました

[Makefile]
  - 互換性を保つために'docker compose'と'docker-compose'コマンドの両方を使えるようにしました
  - docker自身がcompose機能を担うようになったので最新版だとdocker composeのみとなりdocker-composeがdeprecatedとなりました

Author: flll

Makefile

@@ -1,25 +1,26 @@
 # Makefile
 .SILENT:
 
-DOCKER_IMAGE=$(shell sed -ne 's/^.*image:[ \t]*//p' docker-compose.yml)
+DOCKER_IMAGE=$(shell sed -ne 's/^.*image:[ \t]*//p' compose.yml)
 DOCKER_ARCH=-$(subst x86_64,amd64,$(subst aarch64,arm64,$(shell uname -m)))
+DOCKER_COMPOSE=$(shell docker compose version > /dev/null 2>&1 && echo docker compose || echo docker-compose)
 
 build:
-	-docker pull ${DOCKER_IMAGE} | awk '{ print } /Downloaded newer image/ { system("docker-compose down"); }'
-	docker-compose ls | grep atomcam_tools > /dev/null || docker-compose up -d
-	docker-compose exec builder /src/buildscripts/build_all | tee rebuild_`date +"%Y%m%d_%H%M%S"`.log
+	-docker pull ${DOCKER_IMAGE} | awk '{ print } /Downloaded newer image/ { system("$(DOCKER_COMPOSE) down"); }'
+	$(DOCKER_COMPOSE) ls | grep atomcam_tools > /dev/null || $(DOCKER_COMPOSE) up -d
+	$(DOCKER_COMPOSE) exec builder /src/buildscripts/build_all | tee rebuild_`date +"%Y%m%d_%H%M%S"`.log
 
 build-local:
-	docker-compose ls | grep atomcam_tools > /dev/null || docker-compose up -d
-	docker-compose exec builder /src/buildscripts/build_all | tee rebuild_`date +"%Y%m%d_%H%M%S"`.log
+	$(DOCKER_COMPOSE) ls | grep atomcam_tools > /dev/null || $(DOCKER_COMPOSE) up -d
+	$(DOCKER_COMPOSE) exec builder /src/buildscripts/build_all | tee rebuild_`date +"%Y%m%d_%H%M%S"`.log
 
 docker-build:
 	# build container
 	docker build -t ${DOCKER_IMAGE}${DOCKER_ARCH} . | tee docker-build_`date +"%Y%m%d_%H%M%S"`.log
 
 login:
-	docker-compose ls | grep atomcam_tools > /dev/null || docker-compose up -d
-	docker-compose exec builder bash
+	$(DOCKER_COMPOSE) ls | grep atomcam_tools > /dev/null || $(DOCKER_COMPOSE) up -d
+	$(DOCKER_COMPOSE) exec builder bash
 
 lima:
 	[ "`uname -s`" = "Darwin" ] || exit 0

atomcam_tools.xcodeproj/project.pbxproj

@@ -16,7 +16,7 @@
 		15AD4A35273934B30093AC3F /* build.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = build.md; sourceTree = "<group>"; };
 		15B1B2D22765CEB60034BDCF /* patches */ = {isa = PBXFileReference; lastKnownFileType = folder; path = patches; sourceTree = "<group>"; };
 		15B1B2D32765CEB60034BDCF /* configs */ = {isa = PBXFileReference; lastKnownFileType = folder; path = configs; sourceTree = "<group>"; };
-		15B1B2D42765CEB60034BDCF /* docker-compose.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = "docker-compose.yml"; sourceTree = "<group>"; };
+		15B1B2D42765CEB60034BDCF /* compose.yml */ = {isa = PBXFileReference; lastKnownFileType = text.yaml; path = "compose.yml"; sourceTree = "<group>"; };
 		15B1B2D52765CEB60034BDCF /* web */ = {isa = PBXFileReference; lastKnownFileType = folder; path = web; sourceTree = "<group>"; };
 		15B1B2D62765CEB60034BDCF /* libcallback */ = {isa = PBXFileReference; lastKnownFileType = folder; path = libcallback; sourceTree = "<group>"; };
 		15B1B2D72765CEB60034BDCF /* buildscripts */ = {isa = PBXFileReference; lastKnownFileType = folder; path = buildscripts; sourceTree = "<group>"; };
@@ -41,7 +41,7 @@
 				156A36DA1F5AE96F0026EC60 /* README.md */,
 				15AD4A35273934B30093AC3F /* build.md */,
 				1541FB8D1F1116CE006343F3 /* license */,
-				15B1B2D42765CEB60034BDCF /* docker-compose.yml */,
+				15B1B2D42765CEB60034BDCF /* compose.yml */,
 				15B1B2D72765CEB60034BDCF /* buildscripts */,
 				15B1B2D32765CEB60034BDCF /* configs */,
 				15B1B2D62765CEB60034BDCF /* libcallback */,