Skip to content

Commit 604933f

Browse files
committed
Fix: remove deprecated 'docker-compose'
1 parent c6ce7c9 commit 604933f

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

localinstall/2-install_api.sh

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
#!/bin/sh
22
. ./main.cfg
33

4-
# is docker-compose exists? if not use docker compose
5-
if [ -z "$(which docker-compose)" ]; then
6-
echo "docker-compose is not installed, using docker compose"
7-
DOCKER_COMPOSE="docker compose"
8-
else
9-
DOCKER_COMPOSE="docker-compose"
10-
fi
11-
124
# i am groot?
135
if [ $(id -u) -ne 0 ]; then
146
SUDO=sudo
@@ -36,8 +28,8 @@ fi
3628
cat ../../ssh.key.pub > docker/ssh/user-data/authorized_keys
3729

3830
# down, just in case old containers are running
39-
${DOCKER_COMPOSE} down
40-
${DOCKER_COMPOSE} up -d
31+
docker compose down
32+
docker compose up -d
4133
echo "Waiting for API to be up"
4234
sleep 1
4335
# loop until the API is up, try 5 times

localinstall/4-start-cycle.sh

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
#!/bin/bash
22
. ./main.cfg
33

4-
# is docker-compose exists? if not use docker compose
5-
if [ -z "$(which docker-compose)" ]; then
6-
echo "docker-compose is not installed, using docker compose"
7-
DOCKER_COMPOSE="docker compose"
8-
else
9-
DOCKER_COMPOSE="docker-compose"
10-
fi
11-
124
cd kernelci/kernelci-pipeline
13-
${DOCKER_COMPOSE} down
14-
${DOCKER_COMPOSE} up -d
5+
docker compose down
6+
docker compose up -d
7+
158
echo "You can view now logs of containers using docker logs -f <container_id> or docker-compose logs -f in kernelci/kernelci-pipeline or kernelci/kernelci-api directories"
169
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 <container_id>"
1710
echo "You can also open API viewer at http://127.0.0.1:8001/viewer"

0 commit comments

Comments
 (0)