ci: use docker compose v2

Signed-off-by: Boris Glimcher <[email protected]>
opiproject · Aug 2, 2024 · 7be978c · 7be978c
1 parent 0b10290
commit 7be978c
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -68,30 +68,30 @@ jobs:
       - uses: docker/setup-buildx-action@edfb0fe6204400c56fbfd3feba3fe9ad1adfa345
 
       - name: Start containers
-        run: docker-compose up --build --force-recreate --detach
+        run: docker compose up --build --force-recreate --detach
 
       - name: Run Tests
         run: |
           set -x
-          name=$(docker-compose ps | grep device | awk '{print $1}')
+          name=$(docker compose ps | grep device | awk '{print $1}')
           rc=$(docker wait "${name}")
           if [ "${rc}" != "0" ]; then
               echo "device failed:"
               docker logs "${name}"
               exit 1
           fi
           # Test without SSL first
-          docker-compose exec -T spdk sh -xc 'spdk_nvme_identify -r "traddr:`hostname -i` trtype:TCP adrfam:IPv4 trsvcid:5555 hostnqn:nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c"'
-          docker-compose exec -T spdk sh -xc 'spdk_nvme_perf     -r "traddr:`hostname -i` trtype:TCP adrfam:IPv4 trsvcid:5555 hostnqn:nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c subnqn:nqn.2016-06.io.spdk:cnode1" -c 0x1 -q 1 -o 4096 -w randread -t 10' | tee lognotls.txt
+          docker compose exec -T spdk sh -xc 'spdk_nvme_identify -r "traddr:`hostname -i` trtype:TCP adrfam:IPv4 trsvcid:5555 hostnqn:nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c"'
+          docker compose exec -T spdk sh -xc 'spdk_nvme_perf     -r "traddr:`hostname -i` trtype:TCP adrfam:IPv4 trsvcid:5555 hostnqn:nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c subnqn:nqn.2016-06.io.spdk:cnode1" -c 0x1 -q 1 -o 4096 -w randread -t 10' | tee lognotls.txt
           grep "Total" lognotls.txt
           # TODO: identify doesn't work with SSL yet
-          docker-compose exec -T spdk sh -xc 'spdk_nvme_perf     -r "traddr:`hostname -i` trtype:TCP adrfam:IPv4 trsvcid:4444 hostnqn:nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c subnqn:nqn.2016-06.io.spdk:cnode1" -c 0x1 -q 1 -o 4096 -w randread -t 10 -S ssl --psk-path /tmp/opikey.txt' | tee log.txt
+          docker compose exec -T spdk sh -xc 'spdk_nvme_perf     -r "traddr:`hostname -i` trtype:TCP adrfam:IPv4 trsvcid:4444 hostnqn:nqn.2014-08.org.nvmexpress:uuid:feb98abe-d51f-40c8-b348-2753f3571d3c subnqn:nqn.2016-06.io.spdk:cnode1" -c 0x1 -q 1 -o 4096 -w randread -t 10 -S ssl --psk-path /tmp/opikey.txt' | tee log.txt
           grep "Total" log.txt
 
       - name: Logs
         if: always()
-        run: docker-compose logs
+        run: docker compose logs
 
       - name: Stop containers
         if: always()
-        run: docker-compose down --volumes --remove-orphans
+        run: docker compose down --volumes --remove-orphans