Skip to content

Commit ecfab05

Browse files
fix(integration-tests): update docker compose syntax (#1062)
## 🧰 Changes Docker compose v1 was removed from runner-images, and this caused some workflow jobs to fail
1 parent 9a25e82 commit ecfab05

File tree

6 files changed

+20
-20
lines changed

6 files changed

+20
-20
lines changed

.github/workflows/dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- name: Cleanup
2323
if: always()
24-
run: docker-compose down
24+
run: docker compose down
2525

2626
build:
2727
runs-on: ubuntu-latest

.github/workflows/nodejs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323

2424
- name: Cleanup
2525
if: always()
26-
run: docker-compose down
26+
run: docker compose down
2727

2828
build:
2929
runs-on: ubuntu-latest

.github/workflows/php.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- name: Cleanup
2323
if: always()
24-
run: docker-compose down
24+
run: docker compose down
2525

2626
build:
2727
runs-on: ubuntu-latest

.github/workflows/python.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- name: Cleanup
2424
if: always()
25-
run: docker-compose down
25+
run: docker compose down
2626

2727
build:
2828
name: ${{ matrix.python-version }} on ${{ matrix.os }}

.github/workflows/ruby.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
- name: Cleanup
2424
if: always()
25-
run: docker-compose down
25+
run: docker compose down
2626

2727
build:
2828
runs-on: ubuntu-latest

Makefile

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@ help: ## Display this help screen
44
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
55

66
cleanup:
7-
@docker-compose down
7+
@docker compose down
88

99
cleanup-failure:
10-
@docker-compose down
10+
@docker compose down
1111
exit 1
1212

1313
##
1414
## .NET
1515
##
1616
test-metrics-dotnet: ## Run Metrics tests against the .NET SDK
17-
docker-compose up --build --detach integration_dotnet_metrics_v6.0
17+
docker compose up --build --detach integration_dotnet_metrics_v6.0
1818
sleep 5
1919
npm run test:integration-metrics || make cleanup-failure
2020
@make cleanup
2121

2222
test-webhooks-dotnet: ## Run webhooks tests against the .NET SDK
23-
docker-compose up --build --detach integration_dotnet_webhooks_v6.0
23+
docker compose up --build --detach integration_dotnet_webhooks_v6.0
2424
npm run test:integration-webhooks || make cleanup-failure
2525
@make cleanup
2626

@@ -29,22 +29,22 @@ test-webhooks-dotnet: ## Run webhooks tests against the .NET SDK
2929
##
3030

3131
test-metrics-node-express: ## Run Metrics tests against the Node SDK + Express
32-
docker-compose up --build --detach integration_node_express
32+
docker compose up --build --detach integration_node_express
3333
SUPPORTS_HASHING=true npm run test:integration-metrics || make cleanup-failure
3434
@make cleanup
3535

3636
test-webhooks-node-express: ## Run webhooks tests against the Node SDK + Express
37-
docker-compose up --build --detach integration_node_express
37+
docker compose up --build --detach integration_node_express
3838
npm run test:integration-webhooks || make cleanup-failure
3939
@make cleanup
4040

4141
test-metrics-node-fastify: ## Run Metrics tests against the Node SDK + Fastify
42-
docker-compose up --build --detach integration_node_fastify
42+
docker compose up --build --detach integration_node_fastify
4343
SUPPORTS_HASHING=true npm run test:integration-metrics || make cleanup-failure
4444
@make cleanup
4545

4646
test-metrics-node-hapi: ## Run Metrics tests against the Node SDK + hapi
47-
docker-compose up --build --detach integration_node_hapi
47+
docker compose up --build --detach integration_node_hapi
4848
SUPPORTS_HASHING=true npm run test:integration-metrics || make cleanup-failure
4949
@make cleanup
5050

@@ -53,12 +53,12 @@ test-metrics-node-hapi: ## Run Metrics tests against the Node SDK + hapi
5353
##
5454

5555
test-metrics-php-laravel: ## Run Metrics tests against the PHP SDK + Laravel
56-
docker-compose up --build --detach integration_php_laravel
56+
docker compose up --build --detach integration_php_laravel
5757
SUPPORTS_MULTIPART=true npm run test:integration-metrics || make cleanup-failure
5858
@make cleanup
5959

6060
test-webhooks-php-laravel: ## Run webhooks tests against the PHP SDK + Laravel
61-
docker-compose up --detach integration_php_laravel
61+
docker compose up --detach integration_php_laravel
6262
SUPPORTS_MULTIPART=true npm run test:integration-webhooks || make cleanup-failure
6363
@make cleanup
6464

@@ -67,17 +67,17 @@ test-webhooks-php-laravel: ## Run webhooks tests against the PHP SDK + Laravel
6767
##
6868

6969
test-metrics-python-django: ## Run Metrics tests against the Python SDK + Django
70-
docker-compose up --build --detach integration_metrics_python_django
70+
docker compose up --build --detach integration_metrics_python_django
7171
npm run test:integration-metrics || make cleanup-failure
7272
@make cleanup
7373

7474
test-metrics-python-flask: ## Run Metrics tests against the Python SDK + Flask
75-
docker-compose up --build --detach integration_python_flask_metrics
75+
docker compose up --build --detach integration_python_flask_metrics
7676
npm run test:integration-metrics || make cleanup-failure
7777
@make cleanup
7878

7979
test-webhooks-python-flask: ## Run webhooks tests against the Python SDK + Flask
80-
docker-compose up --build --detach integration_python_flask_webhooks
80+
docker compose up --build --detach integration_python_flask_webhooks
8181
npm run test:integration-webhooks || make cleanup-failure
8282
@make cleanup
8383

@@ -91,13 +91,13 @@ test-webhooks-python-flask: ## Run webhooks tests against the Python SDK + Flask
9191
# This is the only thing that works consistently. It's not great but it'll do.
9292

9393
test-metrics-ruby-rails: ## Run Metrics tests against the Ruby SDK + Rails
94-
docker-compose up --build --detach integration_ruby_rails
94+
docker compose up --build --detach integration_ruby_rails
9595
sleep 5
9696
SUPPORTS_HASHING=true npm run test:integration-metrics || make cleanup-failure
9797
@make cleanup
9898

9999
test-webhooks-ruby-rails: ## Run webhooks tests against the Ruby SDK + Rails
100-
docker-compose up --build --detach integration_ruby_rails
100+
docker compose up --build --detach integration_ruby_rails
101101
sleep 5
102102
SUPPORTS_HASHING=true npm run test:integration-webhooks || make cleanup-failure
103103
@make cleanup

0 commit comments

Comments
 (0)