You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by ak...@apache.org on 2024/04/03 09:15:22 UTC
(buildstream) 01/01: ci: use docker compose v2
This is an automated email from the ASF dual-hosted git repository.
akitouni pushed a commit to branch abderrahim/docker-compose
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 5c0803f7116fef582d529b546ba2c33e76f14c08
Author: Abderrahim Kitouni <ab...@codethink.co.uk>
AuthorDate: Wed Apr 3 10:14:42 2024 +0100
ci: use docker compose v2
Docker compose v1 was removed from the github runner images, and docker
compose v2 is a docker plugin so it should be called as `docker compose`
rather than `docker-compose`.
---
.github/run-ci.sh | 12 ++++++------
.github/workflows/ci.yml | 2 +-
.github/workflows/merge.yml | 2 +-
.github/workflows/release.yml | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.github/run-ci.sh b/.github/run-ci.sh
index 8ddc8f562..67104cda9 100755
--- a/.github/run-ci.sh
+++ b/.github/run-ci.sh
@@ -59,7 +59,7 @@ function runTest() {
# Run docker-compose from it's directory, because it will use
# relative paths
cd "${topdir}/compose"
- docker-compose \
+ docker compose \
--env-file ${topdir}/common.env \
--file ${topdir}/compose/ci.docker-compose.yml \
run "${test_name}"
@@ -77,23 +77,23 @@ function runServiceTest() {
# Run docker-compose from it's directory, because it will use
# relative paths
cd "${topdir}/compose"
- docker-compose \
+ docker compose \
--env-file "${topdir}/common.env" \
--file "${topdir}/compose/ci.${test_name}.yml" \
up --detach --renew-anon-volumes --remove-orphans
- docker-compose \
+ docker compose \
--env-file "${topdir}/common.env" \
--file "${topdir}/compose/ci.docker-compose.yml" run ${test_name}
test_exit_status=$?
- docker-compose \
+ docker compose \
--env-file "${topdir}/common.env" \
--file "${topdir}/compose/ci.${test_name}.yml" stop
- docker-compose \
+ docker compose \
--env-file "${topdir}/common.env" \
--file "${topdir}/compose/ci.${test_name}.yml" logs
- docker-compose \
+ docker compose \
--env-file "${topdir}/common.env" \
--file "${topdir}/compose/ci.${test_name}.yml" down --volumes
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e3103e230..b74a1a242 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -97,7 +97,7 @@ jobs:
- name: Build documentation using Docker Compose
run: |
- docker-compose \
+ docker compose \
--env-file ${GITHUB_WORKSPACE}/.github/common.env \
--file ${GITHUB_WORKSPACE}/.github/compose/ci.docker-compose.yml \
run \
diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml
index 8cc302507..5596643ac 100644
--- a/.github/workflows/merge.yml
+++ b/.github/workflows/merge.yml
@@ -21,7 +21,7 @@ jobs:
- name: Build documentation using Docker Compose
run: |
- docker-compose \
+ docker compose \
--env-file ${GITHUB_WORKSPACE}/.github/common.env \
--file ${GITHUB_WORKSPACE}/.github/compose/ci.docker-compose.yml \
run \
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index dbac5c40a..461c4d732 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,7 +21,7 @@ jobs:
- name: Build documentation using Docker Compose
run: |
- docker-compose \
+ docker compose \
--env-file ${GITHUB_WORKSPACE}/.github/common.env \
--file ${GITHUB_WORKSPACE}/.github/compose/ci.docker-compose.yml \
run \