From c91dfc558db1b820fe20e14c5c62b9a28ad8a5e5 Mon Sep 17 00:00:00 2001
From: Joachim Bauch <bauch@struktur.de>
Date: Mon, 16 May 2022 10:46:25 +0200
Subject: [PATCH] Switch to official Coturn docker image.

---
 .dockerignore                        |  1 -
 .github/workflows/docker-compose.yml | 32 ++++++++++++++++++++++++++++
 .github/workflows/docker-coturn.yml  | 28 ------------------------
 docker-compose.yml                   | 24 +++++++++++++++++----
 docker/coturn/Dockerfile             |  5 -----
 5 files changed, 52 insertions(+), 38 deletions(-)
 create mode 100644 .github/workflows/docker-compose.yml
 delete mode 100644 .github/workflows/docker-coturn.yml
 delete mode 100644 docker/coturn/Dockerfile

diff --git a/.dockerignore b/.dockerignore
index d1b1e56..0b3d8f1 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,5 @@
 /bin
 /docker/janus
-/docker/coturn
 /Dockerfile
 /docker-compose.yml
 /vendor
diff --git a/.github/workflows/docker-compose.yml b/.github/workflows/docker-compose.yml
new file mode 100644
index 0000000..debf467
--- /dev/null
+++ b/.github/workflows/docker-compose.yml
@@ -0,0 +1,32 @@
+name: docker-compose
+
+on:
+  pull_request:
+    branches: [ master ]
+    paths:
+      - '.github/workflows/docker-compose.yml'
+      - 'docker-compose.yml'
+  push:
+    branches: [ master ]
+    paths:
+      - '.github/workflows/docker-compose.yml'
+      - 'docker-compose.yml'
+
+jobs:
+  pull:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Pull Docker images
+        run: docker-compose pull
+
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build Docker images
+        run: docker-compose build
diff --git a/.github/workflows/docker-coturn.yml b/.github/workflows/docker-coturn.yml
deleted file mode 100644
index a040090..0000000
--- a/.github/workflows/docker-coturn.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: Coturn Docker image
-
-on:
-  pull_request:
-    branches: [ master ]
-    paths:
-      - '.github/workflows/docker-coturn.yml'
-      - 'docker/coturn/Dockerfile'
-  push:
-    branches: [ master ]
-    paths:
-      - '.github/workflows/docker-coturn.yml'
-      - 'docker/coturn/Dockerfile'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Build Docker image
-        uses: docker/build-push-action@v3
-        with:
-          context: docker/coturn
diff --git a/docker-compose.yml b/docker-compose.yml
index 37c66d0..aa9a406 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -24,9 +24,25 @@ services:
     network_mode: host
     restart: unless-stopped
   coturn:
-    build: docker/coturn
+    image: coturn/coturn:latest
     network_mode: host
-    environment:
-      REALM: nextcloud.domain.invalid
-      STATIC_SECRET: static_secret_same_in_server_conf
+    #
+    # Update command parameters as necessary.
+    #
+    # See https://github.com/coturn/coturn/blob/master/README.turnserver for
+    # available options.
+    command:
+      - "--realm"
+      - "nextcloud.domain.invalid"
+      - "--static-auth-secret"
+      - "static_secret_same_in_server_conf"
+      - "--no-stdout-log"
+      - "--log-file"
+      - "stdout"
+      - "--stale-nonce=600"
+      - "--use-auth-secret"
+      - "--lt-cred-mech"
+      - "--fingerprint"
+      - "--no-software-attribute"
+      - "--no-multicast-peers"
     restart: unless-stopped
diff --git a/docker/coturn/Dockerfile b/docker/coturn/Dockerfile
deleted file mode 100644
index 3dbd306..0000000
--- a/docker/coturn/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM alpine:3.13
-
-RUN apk add --no-cache coturn
-
-CMD ["/bin/sh", "-c", "turnserver --prod --fingerprint --use-auth-secret --static-auth-secret=$STATIC_SECRET --realm=$REALM --no-multicast-peers --no-tls --no-dtls"]