From f1de73c86ea4d721b9f9c5909d1d7373fa7f9013 Mon Sep 17 00:00:00 2001 From: Simone Tollardo Date: Mon, 14 Apr 2025 17:32:42 +0200 Subject: [PATCH 1/2] update do 'docker compose' v2 Signed-off-by: Simone Tollardo --- staging.kernelci.org | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/staging.kernelci.org b/staging.kernelci.org index ada0057..a26f0a7 100755 --- a/staging.kernelci.org +++ b/staging.kernelci.org @@ -157,16 +157,16 @@ cmd_api_pipeline() { git fetch origin git checkout origin/staging.kernelci.org echo "Pulling pipeline containers" - docker-compose $compose_files pull + docker compose $compose_files pull set +e - docker-compose $compose_files down --remove-orphans + docker compose $compose_files down --remove-orphans # verify if it failed due orphaned network bug if [ $? -ne 0 ]; then echo "Failed to stop pipeline containers, restarting containerd and docker" docker_workaround echo "Attempting to restart pipeline containers again" set -e - docker-compose $compose_files down --remove-orphans + docker compose $compose_files down --remove-orphans fi set -e cd - @@ -177,28 +177,28 @@ cmd_api_pipeline() { git prune git fetch origin git checkout origin/staging.kernelci.org - docker-compose pull $api_services + docker compose pull $api_services echo "Stopping API containers" set +e - docker-compose down + docker compose down # verify if it failed due orphaned network bug if [ $? -ne 0 ]; then echo "Failed to stop API containers, restarting containerd and docker" docker_workaround echo "Attempting to restart API containers again" set -e - docker-compose down + docker compose down fi set -e echo "Starting API containers" - docker-compose up -d $api_services + docker compose up -d $api_services cd - cd checkout/kernelci-pipeline #REQUIREMENTS=requirements-dev.txt docker-compose $compose_files build --no-cache echo "Starting pipeline containers" SETTINGS=/home/kernelci/config/staging.kernelci.org.secrets.toml \ - docker-compose $compose_files up -d + docker compose $compose_files up -d cd - } From b42dd58995253dab4d684082e512dad190645a67 Mon Sep 17 00:00:00 2001 From: Simone Tollardo Date: Mon, 14 Apr 2025 17:32:58 +0200 Subject: [PATCH 2/2] remove compose files for pipeline updates Signed-off-by: Simone Tollardo --- staging.kernelci.org | 2 -- 1 file changed, 2 deletions(-) diff --git a/staging.kernelci.org b/staging.kernelci.org index a26f0a7..0d7ddf9 100755 --- a/staging.kernelci.org +++ b/staging.kernelci.org @@ -146,8 +146,6 @@ docker_workaround() { cmd_api_pipeline() { compose_files="\ -f docker-compose.yaml \ --f docker-compose-kcidb.yaml \ --f docker-compose-lava.yaml \ -f docker-compose-production.yaml \ " api_services="api db redis"