diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 29c097604..949d6a12f 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -91,6 +91,6 @@ jobs: publish-to-docker-hub: name: Publish to Docker Hub - uses: ./.github/workflows/docker-hub-release.yml + uses: ./.github/workflows/docker-hub-release.yaml secrets: inherit needs: [build-and-test] diff --git a/.gitpod.yaml b/.gitpod.yaml new file mode 100644 index 000000000..d331e118e --- /dev/null +++ b/.gitpod.yaml @@ -0,0 +1,54 @@ +## Learn more about this file at 'https://www.gitpod.io/docs/references/gitpod-yml' +## +## This '.gitpod.yaml' file when placed at the root of a project instructs +## Gitpod how to prepare & build the project, start development environments +## and configure continuous prebuilds. Prebuilds when enabled builds a project +## like a CI server so you can start coding right away - no more waiting for +## dependencies to download and builds to finish when reviewing pull-requests +## or hacking on something new. +## +tasks: + - name: Setup & start + before: sudo sh -c "cat etc/hosts.txt >> /etc/hosts && mkdir -p /etc/routr/certs && cp etc/certs/signaling.p12 /etc/routr/certs/signaling.p12" + init: npm run make + command: npm start + +ports: + - name: Dispatcher + description: Dispatcher service port + port: 51901 + onOpen: ignore + - name: Location + description: Location service port + port: 51902 + onOpen: ignore + - name: Processor + description: Processor service port + port: 51904 + onOpen: ignore + - name: SIP UDP/TCP + description: SIP signaling ports for UDP/TCP + port: 5060-5061 + onOpen: ignore + - name: SIP WS + description: SIP signaling ports for Websocket + port: 5062 + onOpen: ignore + visibility: public + - name: SIP WSS + description: SIP signaling ports for Secure Websocket + port: 5063 + onOpen: ignore + - name: Exra SIP UDP/TCP + description: Extra SIP signaling ports for UDP/TCP + port: 6060-6061 + onOpen: ignore + - name: Extra SIP WS + description: Extra SIP signaling ports for Websocket + port: 6062 + onOpen: ignore + visibility: public + - name: Extra SIP WSS + description: Extra SIP signaling ports for Secure Websocket + port: 6063 + onOpen: ignore \ No newline at end of file diff --git a/.gitpod.yml b/.gitpod.yml deleted file mode 100644 index fa93c556a..000000000 --- a/.gitpod.yml +++ /dev/null @@ -1,32 +0,0 @@ -## Learn more about this file at 'https://www.gitpod.io/docs/references/gitpod-yml' -## -## This '.gitpod.yml' file when placed at the root of a project instructs -## Gitpod how to prepare & build the project, start development environments -## and configure continuous prebuilds. Prebuilds when enabled builds a project -## like a CI server so you can start coding right away - no more waiting for -## dependencies to download and builds to finish when reviewing pull-requests -## or hacking on something new. -## -tasks: - - name: Setup & start - before: sudo sh -c "cat etc/hosts.txt >> /etc/hosts && mkdir -p /etc/routr/certs && cp etc/certs/signaling.p12 /etc/routr/certs/signaling.p12" - init: npm run make - command: npm start - -ports: - - port: 51901-51904 - onOpen: ignore - - port: 5060-5061 - onOpen: ignore - - port: 5062 - onOpen: ignore - visibility: public - - port: 5063 - onOpen: ignore - - port: 6060-6061 - onOpen: ignore - - port: 6062 - onOpen: ignore - visibility: public - - port: 6063 - onOpen: ignore \ No newline at end of file diff --git a/README.md b/README.md index e28677974..169c72b74 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ If you want to support this project, please give it a star. Thanks πŸ™ First, create a directory named "routr". Navigate into the new folder, and then copy the content below: -Filename: _docker-compose.yml_ +Filename: _compose.yaml_ ```yaml version: "3" diff --git a/docs/docs/connect/quick-start/docker.md b/docs/docs/connect/quick-start/docker.md index eead75d15..ef8c3069b 100644 --- a/docs/docs/connect/quick-start/docker.md +++ b/docs/docs/connect/quick-start/docker.md @@ -6,7 +6,7 @@ sidebar_position: 1 First, create a directory named "routr". Navigate into the new folder, and then copy the content below: -Filename: _docker-compose.yml_ +Filename: _compose.yaml_ ```yaml version: "3" diff --git a/docs/docs/connect/webrtc-support.md b/docs/docs/connect/webrtc-support.md index 1ce48cf83..5182c6386 100644 --- a/docs/docs/connect/webrtc-support.md +++ b/docs/docs/connect/webrtc-support.md @@ -6,7 +6,7 @@ Let’s say you want to use SIP.js to make and receive calls. In that case, you Note that this is only needed if you are using a mix of WebRTC and legacy SIP clients. If you are exclusively using WebRTC clients, then you can skip this step. -To enable WebRTC interoperability, you will need to update your docker-compose.yml file to include the `RTPENGINE_HOST` environment variable. Here is an example: +To enable WebRTC interoperability, you will need to update your compose.yaml file to include the `RTPENGINE_HOST` environment variable. Here is an example: ```yaml version: "3" diff --git a/docs/docs/development/building-a-processor.md b/docs/docs/development/building-a-processor.md index e10adb51a..f4b053535 100644 --- a/docs/docs/development/building-a-processor.md +++ b/docs/docs/development/building-a-processor.md @@ -343,7 +343,7 @@ The previous command will create a new folder called `my-processor` with the fol β”œβ”€β”€ LICENSE β”œβ”€β”€ README.md β”œβ”€β”€ commitlint.config.js -β”œβ”€β”€ docker-compose.yml +β”œβ”€β”€ compose.yaml β”œβ”€β”€ package-lock.json β”œβ”€β”€ package.json β”œβ”€β”€ src diff --git a/docs/docs/overview/deploy-with-docker.md b/docs/docs/overview/deploy-with-docker.md index 451514794..9352ff349 100644 --- a/docs/docs/overview/deploy-with-docker.md +++ b/docs/docs/overview/deploy-with-docker.md @@ -10,7 +10,7 @@ You will need Docker and Docker Compose installed on your machine as a prerequis First, create a directory named "routr". Navigate into the new folder, and then copy the content below: -Filename: docker-compose.yml +Filename: compose.yaml ```yaml version: "3" diff --git a/package.json b/package.json index bbcc96951..d23485f67 100644 --- a/package.json +++ b/package.json @@ -19,10 +19,10 @@ "start:requester": "cross-env NODE_ENV=dev LOGS_LEVEL=verbose ./mods/requester/requester.sh", "start:rtprelay": "cross-env NODE_ENV=dev LOGS_LEVEL=verbose nodemon mods/rtprelay/src/runner", "start:docs": "cd docs && npm start", - "rtpengine:up": "docker-compose -f docker-compose.dev.yml up rtpengine -d", - "redis:up": "docker-compose -f docker-compose.dev.yml up redis -d", - "db:up": "docker-compose -f docker-compose.dev.yml up postgres adminer -d", - "db:down": "docker-compose -f docker-compose.dev.yml down", + "rtpengine:up": "docker-compose -f docker-compose.dev.yaml up rtpengine -d", + "redis:up": "docker-compose -f docker-compose.dev.yaml up redis -d", + "db:up": "docker-compose -f docker-compose.dev.yaml up postgres adminer -d", + "db:down": "docker-compose -f docker-compose.dev.yaml down", "db:migrate": "npx prisma migrate dev --schema ./mods/pgdata/schema.prisma --name changeme --preview-feature", "generate:certs": "./.scripts/generate-certs.sh", "convert:certs": "./.scripts/convert-to-p12.sh && mv signaling.p12 etc/certs/",