From f9d818f00fb4d83f82f28cc3f5b2e769d195705b Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Fri, 11 Nov 2022 14:17:11 +0100 Subject: [PATCH 01/10] Coturn support --- .DS_Store | Bin 0 -> 6148 bytes .dockerignore | 1 + README.md | 13 ++++---- docker-compose.yml | 58 +++++++++++++++++++++++++++++++++- dockerfiles/coturn.Dockerfile | 7 ++++ files/coturn/certs/cert.pem | 27 ++++++++++++++++ files/coturn/certs/key.pem | 52 ++++++++++++++++++++++++++++++ files/coturn/entrypoint.sh | 18 +++++++++++ 8 files changed, 169 insertions(+), 7 deletions(-) create mode 100644 .DS_Store create mode 100644 dockerfiles/coturn.Dockerfile create mode 100644 files/coturn/certs/cert.pem create mode 100644 files/coturn/certs/key.pem create mode 100644 files/coturn/entrypoint.sh diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..61eaa451e08f9ba889defcd16be988f82903ace9 GIT binary patch literal 6148 zcmeHKJE{Uf5bRci1(OX8=L+6n5IunxcszZAAP6oRZ{)c=n$@2`Szo4!R6|eA^mNTI z6>M*dh%V0CxkxJ_4ct(!HVn=7%?CEhhyvj_V=o)|lWw=|HiPWf0pm8(fpwD0Bmeh! zJlH0U3Qz$mKn17(6?m%xSzepzTTkU-RDcS6g97$_C~(7?*a!Nj1B15!zzM=`n0qe) zEEWLP#6A!am /etc/turnserver.conf +echo "min-port=${MIN_PORT}" >> /etc/turnserver.conf +echo "max-port=${MAX_PORT}" >> /etc/turnserver.conf +echo "tls-listening-port=${TLS_PORT}" >> /etc/turnserver.conf +echo "psql-userdb=${PSQL}" >> /etc/turnserver.conf +echo "lt-cred-mech=true" >> /etc/turnserver.conf +echo "use-auth-secret=true" >> /etc/turnserver.conf +echo "cert=/certs/cert.pem" >> /etc/turnserver.conf +echo "pkey=/certs/key.pem" >> /etc/turnserver.conf +echo "verbose" >> /etc/turnserver.conf + +echo "####################################################" +cat /etc/turnserver.conf +echo "####################################################" + +turnserver --log-file=stdout \ No newline at end of file From 9829c0b99c31fccb22723ffa26551045c503b1de Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Tue, 18 Apr 2023 13:41:22 +0200 Subject: [PATCH 02/10] Fix Rebase issues --- docker-compose.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index bb2dcd2..88c24b7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,6 @@ services: build: context: . dockerfile: dockerfiles/coturn.Dockerfile - target: dev entrypoint: /bin/sh /entrypoint.sh volumes: - coturn:/var/lib/coturn @@ -115,8 +114,6 @@ services: build: context: . dockerfile: dockerfiles/postgrest.Dockerfile - target: dev - command: postgrest reticulum.conf networks: hubs_network: reticulum: From 11190bcbc5481a7bd09508f4914625b3b00cc359 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Wed, 19 Apr 2023 15:17:46 +0200 Subject: [PATCH 03/10] Remove .DS_Store --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 61eaa451e08f9ba889defcd16be988f82903ace9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKJE{Uf5bRci1(OX8=L+6n5IunxcszZAAP6oRZ{)c=n$@2`Szo4!R6|eA^mNTI z6>M*dh%V0CxkxJ_4ct(!HVn=7%?CEhhyvj_V=o)|lWw=|HiPWf0pm8(fpwD0Bmeh! zJlH0U3Qz$mKn17(6?m%xSzepzTTkU-RDcS6g97$_C~(7?*a!Nj1B15!zzM=`n0qe) zEEWLP#6A!am Date: Wed, 19 Apr 2023 15:19:59 +0200 Subject: [PATCH 04/10] Add new line --- dockerfiles/coturn.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/coturn.Dockerfile b/dockerfiles/coturn.Dockerfile index 61a5c1f..4f74eb3 100644 --- a/dockerfiles/coturn.Dockerfile +++ b/dockerfiles/coturn.Dockerfile @@ -4,4 +4,4 @@ RUN apk add curl netcat-openbsd COPY files/coturn/certs/key.pem /certs/key.pem COPY files/coturn/certs/cert.pem /certs/cert.pem COPY files/coturn/entrypoint.sh /entrypoint.sh -RUN chmod +x /entrypoint.sh \ No newline at end of file +RUN chmod +x /entrypoint.sh From 2f06d2bfa0cd30b25ad6d2a741137670edc3950d Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Wed, 19 Apr 2023 15:20:31 +0200 Subject: [PATCH 05/10] Add new line --- files/coturn/entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/coturn/entrypoint.sh b/files/coturn/entrypoint.sh index 68fc064..a422c85 100644 --- a/files/coturn/entrypoint.sh +++ b/files/coturn/entrypoint.sh @@ -15,4 +15,4 @@ echo "####################################################" cat /etc/turnserver.conf echo "####################################################" -turnserver --log-file=stdout \ No newline at end of file +turnserver --log-file=stdout From da0befdffcc3967863b6e4b1dddf16822b9e6401 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Wed, 19 Apr 2023 15:28:56 +0200 Subject: [PATCH 06/10] Remove ports from README --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 07227b7..2f6273d 100644 --- a/README.md +++ b/README.md @@ -42,13 +42,13 @@ certificate at each of the Hubs ports mapped in [`docker-compose.yml`](docker-compose.yml). At the time of this writing, that means visiting these links in your web browser and following the prompts: -* [4000: Proxy](https://hubs-proxy.local:4000) -* [4443: Dialog](https://hubs.local:4443) -* [9090: Spoke](https://hubs.local:9090) -* [8989: Hubs Admin](https://hubs.local:8989) -* [8080: Hubs Client](https://hubs.local:8080) -* [4000: Reticulum](https://hubs.local:4000) -* [5349: Coturn](https://hubs.local:5349) +* [Proxy](https://hubs-proxy.local:4000) +* [Dialog](https://hubs.local:4443) +* [Spoke](https://hubs.local:9090) +* [Hubs Admin](https://hubs.local:8989) +* [Hubs Client](https://hubs.local:8080) +* [Reticulum](https://hubs.local:4000) +* [Coturn](https://hubs.local:5349) ### Admin panel access From 27fb467d89cb50a73b0b0cf0546124a3828c711f Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Wed, 19 Apr 2023 15:29:18 +0200 Subject: [PATCH 07/10] Add individual coturn file entries to .gitignore --- .dockerignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index dfe5148..e2148b7 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,6 +3,8 @@ !files/dev-perms.pub.pem !files/dev-reticulum-jwk.json !files/dev-reticulum.conf -!files/coturn/ +!files/coturn/entrypoint.sh +!files/coturn/certs/cert.pem +!files/coturn/certs/key.pem !services/reticulum/priv/dev-ssl.cert !services/reticulum/priv/dev-ssl.key From 3e0f7bb0093c1903eddfde6c614cc9354d9ef301 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Wed, 19 Apr 2023 15:37:10 +0200 Subject: [PATCH 08/10] Move coturn entrypoint to the docker file --- docker-compose.yml | 1 - dockerfiles/coturn.Dockerfile | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 88c24b7..85a1b35 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,7 +10,6 @@ services: build: context: . dockerfile: dockerfiles/coturn.Dockerfile - entrypoint: /bin/sh /entrypoint.sh volumes: - coturn:/var/lib/coturn ports: diff --git a/dockerfiles/coturn.Dockerfile b/dockerfiles/coturn.Dockerfile index 4f74eb3..89430aa 100644 --- a/dockerfiles/coturn.Dockerfile +++ b/dockerfiles/coturn.Dockerfile @@ -5,3 +5,4 @@ COPY files/coturn/certs/key.pem /certs/key.pem COPY files/coturn/certs/cert.pem /certs/cert.pem COPY files/coturn/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/bin/sh", "entrypoint.sh"] From 80aa01380851b4d2c5ec1302c8080cc1b69256bc Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Wed, 19 Apr 2023 15:38:03 +0200 Subject: [PATCH 09/10] Fix typo --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 85a1b35..e7bf6ea 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,8 +15,8 @@ services: ports: - "5349:5349" # This should be the same as MIN_PORT MAX_PORT. - # You might neeed to increase this number depending on how many client you are connecting. - # (Keep the ports range small to improve container statup time) + # You might neeed to increase this number depending on how many clients you are connecting. + # (Keep the ports range small to improve container startup time) - "50000-50050:50000-50050" - "50000-50050:50000-50050/udp" networks: From 96f1a32d4d86d4a980403502a0462a3b2f35bc78 Mon Sep 17 00:00:00 2001 From: Manuel Martin Date: Wed, 19 Apr 2023 15:51:20 +0200 Subject: [PATCH 10/10] Fix typo --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index e7bf6ea..1a08aab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -49,8 +49,8 @@ services: ports: - "4443:4443" # This should be the same as MEDIASOUP_MIN_PORT and MEDIASOUP_MAX_PORT - # You might neeed to increase this number depending on how many client you are connecting. - # (Keep the ports range small to improve container statup time) + # You might neeed to increase this number depending on how many clients you are connecting. + # (Keep the ports range small to improve container startup time) - "40000-40050:40000-40050" - "40000-40050:40000-40050/udp" volumes: