Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: use docker compose instead of docker-compose (see https://github.com/orgs/community/discussions/116610) #21992

Merged
merged 1 commit into from
Aug 3, 2024
Merged

ci: use docker compose instead of docker-compose (see https://github.com/orgs/community/discussions/116610) #21992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/websockets_ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion vlib/net/websocket/tests/autobahn/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
5 changes: 1 addition & 4 deletions vlib/net/websocket/tests/autobahn/local_run/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
RUN apt update && apt install -y docker
Loading