Merge branch 'main' of github.com:kosli-dev/cli into 4986-google-cloud-run-1

Author: ToreMerkely

Makefile

@@ -108,14 +108,14 @@ test_setup_restart_server: ensure_gotestsum
 
 setup_test_to_use_local_image:
 	@echo merkely > /tmp/server-image.txt
-	@docker ps -aq | xargs -r docker rm -fv
+	@docker compose down -v
 	@echo "Run make build in the server repo you want to use"
 	@echo "Then run make test_integration"
 	@echo "To look at the logs from local kosli server run: make follow_integration_test_server"
 
 setup_test_to_use_staging_server_image:
 	@rm /tmp/server-image.txt
-	@docker ps -aq | xargs -r docker rm -fv
+	@docker compose down -v
 	@echo "Now run make test_integration"
 	@echo "To look at the logs from kosli server run: make follow_integration_test_server"