From 062c40f58602b930fe1653e06f0085066482ac1a Mon Sep 17 00:00:00 2001
From: Jon Ursenbach <jon@ursenba.ch>
Date: Tue, 3 Sep 2024 17:07:47 -0700
Subject: [PATCH] fix: docker problems

---
 .github/workflows/integration-c.yml      | 4 ++--
 .github/workflows/integration-csharp.yml | 4 ++--
 .github/workflows/integration-go.yml     | 4 ++--
 .github/workflows/integration-node.yml   | 4 ++--
 .github/workflows/integration-php.yml    | 4 ++--
 .github/workflows/integration-python.yml | 4 ++--
 .github/workflows/integration-shell.yml  | 4 ++--
 docker-compose.yml                       | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/integration-c.yml b/.github/workflows/integration-c.yml
index b5da70091..f9e151427 100644
--- a/.github/workflows/integration-c.yml
+++ b/.github/workflows/integration-c.yml
@@ -7,8 +7,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run tests
-        run: docker-compose run integration_c
+        run: docker compose run integration_c
 
       - name: Cleanup
         if: always()
-        run: docker-compose down
+        run: docker compose down
diff --git a/.github/workflows/integration-csharp.yml b/.github/workflows/integration-csharp.yml
index 63fe7a3c8..0865b93eb 100644
--- a/.github/workflows/integration-csharp.yml
+++ b/.github/workflows/integration-csharp.yml
@@ -7,8 +7,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run tests
-        run: docker-compose run integration_csharp
+        run: docker compose run integration_csharp
 
       - name: Cleanup
         if: always()
-        run: docker-compose down
+        run: docker compose down
diff --git a/.github/workflows/integration-go.yml b/.github/workflows/integration-go.yml
index 597d85556..8948a344c 100644
--- a/.github/workflows/integration-go.yml
+++ b/.github/workflows/integration-go.yml
@@ -7,8 +7,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run tests
-        run: docker-compose run integration_golang
+        run: docker compose run integration_golang
 
       - name: Cleanup
         if: always()
-        run: docker-compose down
+        run: docker compose down
diff --git a/.github/workflows/integration-node.yml b/.github/workflows/integration-node.yml
index 636de02e4..4938b813f 100644
--- a/.github/workflows/integration-node.yml
+++ b/.github/workflows/integration-node.yml
@@ -7,8 +7,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run tests
-        run: docker-compose run integration_node
+        run: docker compose run integration_node
 
       - name: Cleanup
         if: always()
-        run: docker-compose down
+        run: docker compose down
diff --git a/.github/workflows/integration-php.yml b/.github/workflows/integration-php.yml
index 3dd951c42..c486f269f 100644
--- a/.github/workflows/integration-php.yml
+++ b/.github/workflows/integration-php.yml
@@ -7,8 +7,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run tests
-        run: docker-compose run integration_php
+        run: docker compose run integration_php
 
       - name: Cleanup
         if: always()
-        run: docker-compose down
+        run: docker compose down
diff --git a/.github/workflows/integration-python.yml b/.github/workflows/integration-python.yml
index 7111584e1..283b088f7 100644
--- a/.github/workflows/integration-python.yml
+++ b/.github/workflows/integration-python.yml
@@ -7,8 +7,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run tests
-        run: docker-compose run integration_python
+        run: docker compose run integration_python
 
       - name: Cleanup
         if: always()
-        run: docker-compose down
+        run: docker compose down
diff --git a/.github/workflows/integration-shell.yml b/.github/workflows/integration-shell.yml
index 2a8123d16..687d32108 100644
--- a/.github/workflows/integration-shell.yml
+++ b/.github/workflows/integration-shell.yml
@@ -7,8 +7,8 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Run tests
-        run: docker-compose run integration_shell
+        run: docker compose run integration_shell
 
       - name: Cleanup
         if: always()
-        run: docker-compose down
+        run: docker compose down
diff --git a/docker-compose.yml b/docker-compose.yml
index 9e030f1c5..4acd614ca 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -22,7 +22,7 @@ services:
       - HTTPS_KEY_FILE=/https-cert/httpbin.org-key.pem
     networks:
       default:
-        # on the docker-compose network, this proxy will be aliased as
+        # on the `docker compose` network, this proxy will be aliased as
         # httpbin.org. To make this work with HTTPS, each integration test
         # container needs to install the root CA contained in
         # ./integrations/https-cert/rootCA.pem