From e90a32e817d0a8bab8d54ab90b017a0de8d7648a Mon Sep 17 00:00:00 2001 From: Tim Deeb-Swihart <409226+tdeebswihart@users.noreply.github.com> Date: Tue, 2 Apr 2024 10:47:37 -0700 Subject: [PATCH] Replace docker-compose with docker compose (#445) --- .github/workflows/dotnet.yaml | 6 +++--- .github/workflows/go.yaml | 6 +++--- .github/workflows/java.yaml | 6 +++--- .github/workflows/python.yaml | 6 +++--- .github/workflows/typescript.yaml | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/dotnet.yaml b/.github/workflows/dotnet.yaml index 47207ca9..e93f33d1 100644 --- a/.github/workflows/dotnet.yaml +++ b/.github/workflows/dotnet.yaml @@ -87,7 +87,7 @@ jobs: - name: Start containerized server and dependencies if: inputs.docker-image-artifact-name run: | - docker-compose \ + docker compose \ -f ./dockerfiles/docker-compose.for-server-image.yaml \ -f /tmp/server-docker/docker-compose.yml \ up -d temporal-server cassandra elasticsearch @@ -100,11 +100,11 @@ jobs: - name: Run containerized SDK-features tests if: inputs.docker-image-artifact-name run: | - docker-compose \ + docker compose \ -f ./dockerfiles/docker-compose.for-server-image.yaml \ -f /tmp/server-docker/docker-compose.yml \ up --no-log-prefix --exit-code-from features-tests-cs features-tests-cs - name: Tear down docker compose if: inputs.docker-image-artifact-name && (success() || failure()) - run: docker-compose -f ./dockerfiles/docker-compose.for-server-image.yaml -f /tmp/server-docker/docker-compose.yml down -v + run: docker compose -f ./dockerfiles/docker-compose.for-server-image.yaml -f /tmp/server-docker/docker-compose.yml down -v diff --git a/.github/workflows/go.yaml b/.github/workflows/go.yaml index bc68ceba..eb134b54 100644 --- a/.github/workflows/go.yaml +++ b/.github/workflows/go.yaml @@ -69,7 +69,7 @@ jobs: - name: Start containerized server and dependencies if: inputs.docker-image-artifact-name run: | - docker-compose \ + docker compose \ -f ./dockerfiles/docker-compose.for-server-image.yaml \ -f /tmp/server-docker/docker-compose.yml \ up -d temporal-server cassandra elasticsearch @@ -84,11 +84,11 @@ jobs: env: WAIT_EXTRA_FOR_NAMESPACE: true run: | - docker-compose \ + docker compose \ -f ./dockerfiles/docker-compose.for-server-image.yaml \ -f /tmp/server-docker/docker-compose.yml \ up --no-log-prefix --exit-code-from features-tests-go features-tests-go - name: Tear down docker compose if: inputs.docker-image-artifact-name && (success() || failure()) - run: docker-compose -f ./dockerfiles/docker-compose.for-server-image.yaml -f /tmp/server-docker/docker-compose.yml down -v + run: docker compose -f ./dockerfiles/docker-compose.for-server-image.yaml -f /tmp/server-docker/docker-compose.yml down -v diff --git a/.github/workflows/java.yaml b/.github/workflows/java.yaml index c5e63c5e..a5078c38 100644 --- a/.github/workflows/java.yaml +++ b/.github/workflows/java.yaml @@ -75,7 +75,7 @@ jobs: - name: Start containerized server and dependencies if: inputs.docker-image-artifact-name run: | - docker-compose \ + docker compose \ -f ./dockerfiles/docker-compose.for-server-image.yaml \ -f /tmp/server-docker/docker-compose.yml \ up -d temporal-server cassandra elasticsearch @@ -88,11 +88,11 @@ jobs: - name: Run containerized SDK-features tests if: inputs.docker-image-artifact-name run: | - docker-compose \ + docker compose \ -f ./dockerfiles/docker-compose.for-server-image.yaml \ -f /tmp/server-docker/docker-compose.yml \ up --no-log-prefix --exit-code-from features-tests-java features-tests-java - name: Tear down docker compose if: inputs.docker-image-artifact-name && (success() || failure()) - run: docker-compose -f ./dockerfiles/docker-compose.for-server-image.yaml -f /tmp/server-docker/docker-compose.yml down -v + run: docker compose -f ./dockerfiles/docker-compose.for-server-image.yaml -f /tmp/server-docker/docker-compose.yml down -v diff --git a/.github/workflows/python.yaml b/.github/workflows/python.yaml index 0eb3a2c2..f07e5a0d 100644 --- a/.github/workflows/python.yaml +++ b/.github/workflows/python.yaml @@ -94,7 +94,7 @@ jobs: - name: Start containerized server and dependencies if: inputs.docker-image-artifact-name run: | - docker-compose \ + docker compose \ -f ./dockerfiles/docker-compose.for-server-image.yaml \ -f /tmp/server-docker/docker-compose.yml \ up -d temporal-server cassandra elasticsearch @@ -107,11 +107,11 @@ jobs: - name: Run containerized SDK-features tests if: inputs.docker-image-artifact-name run: | - docker-compose \ + docker compose \ -f ./dockerfiles/docker-compose.for-server-image.yaml \ -f /tmp/server-docker/docker-compose.yml \ up --no-log-prefix --exit-code-from features-tests-py features-tests-py - name: Tear down docker compose if: inputs.docker-image-artifact-name && (success() || failure()) - run: docker-compose -f ./dockerfiles/docker-compose.for-server-image.yaml -f /tmp/server-docker/docker-compose.yml down -v + run: docker compose -f ./dockerfiles/docker-compose.for-server-image.yaml -f /tmp/server-docker/docker-compose.yml down -v diff --git a/.github/workflows/typescript.yaml b/.github/workflows/typescript.yaml index 6f7ad9ff..2e6a259f 100644 --- a/.github/workflows/typescript.yaml +++ b/.github/workflows/typescript.yaml @@ -94,7 +94,7 @@ jobs: - name: Start containerized server and dependencies if: inputs.docker-image-artifact-name run: | - docker-compose \ + docker compose \ -f ./dockerfiles/docker-compose.for-server-image.yaml \ -f /tmp/server-docker/docker-compose.yml \ up -d temporal-server cassandra elasticsearch @@ -107,11 +107,11 @@ jobs: - name: Run containerized SDK-features tests if: inputs.docker-image-artifact-name run: | - docker-compose \ + docker compose \ -f ./dockerfiles/docker-compose.for-server-image.yaml \ -f /tmp/server-docker/docker-compose.yml \ up --no-log-prefix --exit-code-from features-tests-ts features-tests-ts - name: Tear down docker compose if: inputs.docker-image-artifact-name && (success() || failure()) - run: docker-compose -f ./dockerfiles/docker-compose.for-server-image.yaml -f /tmp/server-docker/docker-compose.yml down -v + run: docker compose -f ./dockerfiles/docker-compose.for-server-image.yaml -f /tmp/server-docker/docker-compose.yml down -v