Merge branch 'main' into dev-283

rstudio · Aug 6, 2024 · f68d2d5 · f68d2d5
2 parents 8b88b59 + 91e471e
commit f68d2d5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -96,7 +96,7 @@ jobs:
 
       - name: run Posit Connect
         run: |
-          docker-compose up --build -d
+          docker compose up --build -d
           make dev
         env:
           RSC_LICENSE: ${{ secrets.RSC_LICENSE }}

diff --git a/Makefile b/Makefile
@@ -7,14 +7,14 @@ RSC_API_KEYS=pins/tests/rsconnect_api_keys.json
 dev: pins/tests/rsconnect_api_keys.json
 
 dev-start:
-	docker-compose up -d
-	docker-compose exec -T rsconnect bash < script/setup-rsconnect/add-users.sh
+	docker compose up -d
+	docker compose exec -T rsconnect bash < script/setup-rsconnect/add-users.sh
 	# curl fails with error 52 without a short sleep....
 	sleep 5
 	curl -s --retry 10 --retry-connrefused http://localhost:3939
 
 dev-stop:
-	docker-compose down
+	docker compose down
 	rm -f $(RSC_API_KEYS)
 
 $(RSC_API_KEYS): dev-start