From f733b49ba6320dda1d183562db284b981dd11acd Mon Sep 17 00:00:00 2001 From: Simone Tollardo Date: Thu, 10 Apr 2025 16:48:22 +0200 Subject: [PATCH] Fix: remove deprecated 'docker-compose' Signed-off-by: Simone Tollardo --- localinstall/2-install_api.sh | 12 ++---------- localinstall/4-start-cycle.sh | 13 +++---------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/localinstall/2-install_api.sh b/localinstall/2-install_api.sh index 102d3a5..1c33ea6 100755 --- a/localinstall/2-install_api.sh +++ b/localinstall/2-install_api.sh @@ -1,14 +1,6 @@ #!/bin/sh . ./main.cfg -# is docker-compose exists? if not use docker compose -if [ -z "$(which docker-compose)" ]; then - echo "docker-compose is not installed, using docker compose" - DOCKER_COMPOSE="docker compose" -else - DOCKER_COMPOSE="docker-compose" -fi - # i am groot? if [ $(id -u) -ne 0 ]; then SUDO=sudo @@ -36,8 +28,8 @@ fi cat ../../ssh.key.pub > docker/ssh/user-data/authorized_keys # down, just in case old containers are running -${DOCKER_COMPOSE} down -${DOCKER_COMPOSE} up -d +docker compose down +docker compose up -d echo "Waiting for API to be up" sleep 1 # loop until the API is up, try 5 times diff --git a/localinstall/4-start-cycle.sh b/localinstall/4-start-cycle.sh index caca6d4..8cced24 100755 --- a/localinstall/4-start-cycle.sh +++ b/localinstall/4-start-cycle.sh @@ -1,17 +1,10 @@ #!/bin/bash . ./main.cfg -# is docker-compose exists? if not use docker compose -if [ -z "$(which docker-compose)" ]; then - echo "docker-compose is not installed, using docker compose" - DOCKER_COMPOSE="docker compose" -else - DOCKER_COMPOSE="docker-compose" -fi - cd kernelci/kernelci-pipeline -${DOCKER_COMPOSE} down -${DOCKER_COMPOSE} up -d +docker compose down +docker compose up -d + echo "You can view now logs of containers using docker logs -f or docker-compose logs -f in kernelci/kernelci-pipeline or kernelci/kernelci-api directories" echo "Also you can do docker ps to see running containers, and in case of ongoing builds, you can view their logs too by docker logs -f " echo "You can also open API viewer at http://127.0.0.1:8001/viewer"