From e906033e4e55ebc76876f16f930957a58b5138f0 Mon Sep 17 00:00:00 2001 From: Delyan Angelov Date: Sat, 3 Aug 2024 19:50:52 +0300 Subject: [PATCH] ci: use `docker compose` instead of `docker-compose` (see https://github.com/orgs/community/discussions/116610) (#21992) --- .github/workflows/websockets_ci.yml | 2 +- vlib/net/websocket/tests/autobahn/README.md | 2 +- vlib/net/websocket/tests/autobahn/local_run/Dockerfile | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/websockets_ci.yml b/.github/workflows/websockets_ci.yml index e8f7fd9de2..46252ed885 100644 --- a/.github/workflows/websockets_ci.yml +++ b/.github/workflows/websockets_ci.yml @@ -43,7 +43,7 @@ jobs: ## Autobahn integrations tests - name: Run autobahn services - run: docker-compose -f ${{github.workspace}}/vlib/net/websocket/tests/autobahn/docker-compose.yml up -d + run: docker compose -f ${{github.workspace}}/vlib/net/websocket/tests/autobahn/docker-compose.yml up -d - name: Wait for the service to start run: sleep 10s diff --git a/vlib/net/websocket/tests/autobahn/README.md b/vlib/net/websocket/tests/autobahn/README.md index 2f210e7101..cf7adda05e 100644 --- a/vlib/net/websocket/tests/autobahn/README.md +++ b/vlib/net/websocket/tests/autobahn/README.md @@ -9,7 +9,7 @@ The performance tests are skipped due to timeouts in Github actions. This is how to test the client: -1. Run the docker autobahn test suite by running the `docker-compose up` +1. Run the docker autobahn test suite by running the `docker compose up` 2. From the `local_run` folder, compile and run `autobahn_client.v` to test non wss (no TLS) and `autobahn_client_wss.v` to run the TLS tests 3. Open `http://localhost:8080` and browse client test results for non TLS and `https://localhost:8081` diff --git a/vlib/net/websocket/tests/autobahn/local_run/Dockerfile b/vlib/net/websocket/tests/autobahn/local_run/Dockerfile index b14b1cd6cc..44785dc0be 100644 --- a/vlib/net/websocket/tests/autobahn/local_run/Dockerfile +++ b/vlib/net/websocket/tests/autobahn/local_run/Dockerfile @@ -6,7 +6,4 @@ FROM node:12.6-buster-slim COPY config/fuzzingserver.json /config/fuzzingserver.json RUN chmod +775 /config/fuzzingserver.json -RUN apt update && \ - apt install -y \ - docker \ - docker-compose \ No newline at end of file +RUN apt update && apt install -y docker