Merge branch 'main' into dependabot/github_actions/fossas/fossa-actio…

…n-1.4.0
in-toto · Aug 12, 2024 · 5a5fa58 · 5a5fa58
2 parents 91f9937 + 9886f9e
commit 5a5fa58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -81,7 +81,7 @@ you stay up-to-date with our repository:
 ### Running Archivista Development Environment
 
 *Please note that the following `make` commands make use of both the `docker` and
-`docker-compose` commands, so you may need to modify this locally if using tools
+`docker compose` commands, so you may need to modify this locally if using tools
 such as [nerdctl](https://github.com/containerd/nerdctl) or [podman](https://github.com/containers/podman).*
 
 To start the Archivista development environment, simply execute the command:

diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ run-dev:  ## Run the dev server
 
 .PHONY: stop
 stop:  ## Stop the dev server
-	@docker-compose -f compose-dev.yml down -v
+	@docker compose -f compose-dev.yml down -v
 
 
 .PHONY: clean