Switch docker-compose to docker compose

Fixes #872
pulumi · Apr 2, 2024 · 59654af · 59654af
1 parent eecfc5f
commit 59654af
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/native-provider-ci/src/steps.ts b/native-provider-ci/src/steps.ts
@@ -344,8 +344,8 @@ export function InstallPulumiCli(version?: string): Step {
 export function RunDockerComposeStep(required?: boolean): Step {
   if (required) {
     return {
-      name: "Run docker-compose",
-      run: "docker-compose -f testing/docker-compose.yml up --build -d",
+      name: "Run docker compose",
+      run: "docker compose -f testing/docker-compose.yml up --build -d",
     };
   }
   return {};

diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/main.yml
@@ -267,8 +267,8 @@ jobs:
         pip3 install virtualenv==20.0.23
         pip3 install pipenv
     #{{- if .Config.docker }}#
-    - name: Run docker-compose
-      run: docker-compose -f testing/docker-compose.yml up --build -d
+    - name: Run docker compose
+      run: docker compose -f testing/docker-compose.yml up --build -d
     #{{- end }}#
     #{{- if .Config.aws }}#
     - name: Configure AWS Credentials

diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/nightly-test.yml
@@ -100,8 +100,8 @@ jobs:
         pip3 install virtualenv==20.0.23
         pip3 install pipenv
     #{{- if .Config.docker }}#
-    - name: Run docker-compose
-      run: docker-compose -f testing/docker-compose.yml up --build -d
+    - name: Run docker compose
+      run: docker compose -f testing/docker-compose.yml up --build -d
     #{{- end }}#
     #{{- if .Config.aws }}#
     - name: Configure AWS Credentials

diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/prerelease.yml
@@ -192,8 +192,8 @@ jobs:
         pip3 install virtualenv==20.0.23
         pip3 install pipenv
     #{{- if .Config.docker }}#
-    - name: Run docker-compose
-      run: docker-compose -f testing/docker-compose.yml up --build -d
+    - name: Run docker compose
+      run: docker compose -f testing/docker-compose.yml up --build -d
     #{{- end }}#
     #{{- if .Config.aws }}#
     - name: Configure AWS Credentials

diff --git a/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml b/provider-ci/internal/pkg/templates/bridged-provider/.github/workflows/release.yml
@@ -249,8 +249,8 @@ jobs:
         pip3 install virtualenv==20.0.23
         pip3 install pipenv
     #{{- if .Config.docker }}#
-    - name: Run docker-compose
-      run: docker-compose -f testing/docker-compose.yml up --build -d
+    - name: Run docker compose
+      run: docker compose -f testing/docker-compose.yml up --build -d
     #{{- end }}#
     #{{- if .Config.aws }}#
     - name: Configure AWS Credentials

diff --git a/...der-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml b/...der-ci/internal/pkg/templates/bridged-provider/.github/workflows/run-acceptance-tests.yml
@@ -192,8 +192,8 @@ jobs:
         pip3 install virtualenv==20.0.23
         pip3 install pipenv
     #{{- if .Config.docker }}#
-    - name: Run docker-compose
-      run: docker-compose -f testing/docker-compose.yml up --build -d
+    - name: Run docker compose
+      run: docker compose -f testing/docker-compose.yml up --build -d
     #{{- end }}#
     #{{- if .Config.aws }}#
     - name: Configure AWS Credentials