Merge pull request #220 from taketo1113/update-docker-compose-v2

Update for Compatibility with Docker Compose v2

Makefile

@@ -56,19 +56,19 @@ build-container: venv ## Build container image
 		-f docker/Dockerfile.nginx . --label "org.opencontainers.image.revision=$(GIT_HASH)"
 
 .PHONY: start-container
-start-container: ## Start container via docker-compose, runs ctidorg/tram:latest image by default
-	docker-compose -f docker/docker-compose.yml up -d
+start-container: ## Start container via docker compose, runs ctidorg/tram:latest image by default
+	docker compose -f docker/docker-compose.yml up -d
 	@echo "Waiting for container to start..."
-	@echo "To stop the container, run: make stop-container, or, docker-compose -f docker/docker-compose.yml down"
-	@echo "To view container logs, run make container-logs, or, docker-compose -f docker/docker-compose.yml logs -f"
+	@echo "To stop the container, run: make stop-container, or, docker compose -f docker/docker-compose.yml down"
+	@echo "To view container logs, run make container-logs, or, docker compose -f docker/docker-compose.yml logs -f"
 
 .PHONY: stop-container
 stop-container: ## Stop container via docker-compose
-	docker-compose -f docker/docker-compose.yml down
+	docker compose -f docker/docker-compose.yml down
 
 .PHONY: container-logs
 container-logs: ## Print container logs
-	docker-compose -f docker/docker-compose.yml logs -f
+	docker compose -f docker/docker-compose.yml logs -f
 
 .PHONY: clean
 clean: ## Clean up pycache files

docker/docker-compose.yml

@@ -6,7 +6,6 @@
 #  - ALLOWED_HOSTS is a list of hosts allowed to connect to the Django server (in settings.py)
 #  - SECRET_KEY is generated at startup to a random value. Set SECRET_KEY env variable for tram service below
 #               to use a static value.
-version: '3.5'
 services:
   tram:
     image: ghcr.io/center-for-threat-informed-defense/tram:latest