From f908c65a06113bd7fca2700fe7ce4508e36255b1 Mon Sep 17 00:00:00 2001
From: tyranron <tyranron@gmail.com>
Date: Tue, 13 Jun 2023 15:16:07 +0200
Subject: [PATCH] Upgrade Debian to "bookworm" in Docker image

---
 docker/coturn/CHANGELOG.md                             | 10 ++++++++++
 docker/coturn/Makefile                                 |  2 +-
 docker/coturn/README.md                                |  4 ++--
 docker/coturn/debian/Dockerfile                        |  4 ++--
 .../coturn/rootfs/usr/local/bin/detect-external-ip.sh  |  2 +-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/docker/coturn/CHANGELOG.md b/docker/coturn/CHANGELOG.md
index 66e94ad..ff281d9 100644
--- a/docker/coturn/CHANGELOG.md
+++ b/docker/coturn/CHANGELOG.md
@@ -4,6 +4,16 @@ Coturn TURN server Docker image changelog
 
 
 
+## [4.6.2-r2] · 2023-06-13
+[4.6.2-r2]: /../../tree/docker/4.6.2-r2
+
+### Upgraded
+
+- [Debian Linux] "bookworm": <https://www.debian.org/releases/bookworm>
+
+
+
+
 ## [4.6.2-r1] · 2023-05-10
 [4.6.2-r1]: /../../tree/docker/4.6.2-r1
 
diff --git a/docker/coturn/Makefile b/docker/coturn/Makefile
index 1c7bfca..5f035bc 100644
--- a/docker/coturn/Makefile
+++ b/docker/coturn/Makefile
@@ -28,7 +28,7 @@ COTURN_VER ?= 4.6.2
 COTURN_MIN_VER = $(strip $(shell echo $(COTURN_VER) | cut -d '.' -f1,2))
 COTURN_MAJ_VER = $(strip $(shell echo $(COTURN_VER) | cut -d '.' -f1))
 
-BUILD_REV ?= 1
+BUILD_REV ?= 2
 
 NAME := coturn
 OWNER := $(or $(GITHUB_REPOSITORY_OWNER),coturn)
diff --git a/docker/coturn/README.md b/docker/coturn/README.md
index dbcdb7a..48ba5f6 100644
--- a/docker/coturn/README.md
+++ b/docker/coturn/README.md
@@ -15,8 +15,8 @@ Coturn TURN server Docker image
 
 ## Supported tags and respective `Dockerfile` links
 
-- [`4.6.2-r1`, `4.6.2-r1-debian`, `4.6.2`, `4.6.2-debian`, `4.6`, `4.6-debian`, `4`, `4-debian`, `debian`, `latest`][d1]
-- [`4.6.2-r1-alpine`, `4.6.2-alpine`, `4.6-alpine`, `4-alpine`, `alpine`][d2]
+- [`4.6.2-r2`, `4.6.2-r2-debian`, `4.6.2`, `4.6.2-debian`, `4.6`, `4.6-debian`, `4`, `4-debian`, `debian`, `latest`][d1]
+- [`4.6.2-r2-alpine`, `4.6.2-alpine`, `4.6-alpine`, `4-alpine`, `alpine`][d2]
 
 
 
diff --git a/docker/coturn/debian/Dockerfile b/docker/coturn/debian/Dockerfile
index d08fcf9..1011dfe 100644
--- a/docker/coturn/debian/Dockerfile
+++ b/docker/coturn/debian/Dockerfile
@@ -2,7 +2,7 @@
 # Dockerfile of coturn/coturn:debian Docker image.
 #
 
-ARG debian_ver=bullseye
+ARG debian_ver=bookworm
 
 
 
@@ -183,7 +183,7 @@ RUN apt-get update \
             libatomic1 \
             libevent-2.1-7 libevent-core-2.1-7 libevent-extra-2.1-7 \
             libevent-openssl-2.1-7 libevent-pthreads-2.1-7 \
-            libssl1.1 \
+            libssl3 \
             libpq5 libmariadb3 libsqlite3-0 \
             libhiredis0.14 \
             libmongoc-1.0-0 \
diff --git a/docker/coturn/rootfs/usr/local/bin/detect-external-ip.sh b/docker/coturn/rootfs/usr/local/bin/detect-external-ip.sh
index c019c2f..669adbc 100644
--- a/docker/coturn/rootfs/usr/local/bin/detect-external-ip.sh
+++ b/docker/coturn/rootfs/usr/local/bin/detect-external-ip.sh
@@ -102,7 +102,7 @@ fi
 
 IFS="$(printf '\nx')" && IFS="${IFS%x}"
 for COMMAND in $COMMANDS; do
-  if IP="$(eval "$COMMAND")" && is_valid_ip "$IP"; then
+  if IP="$(eval "$COMMAND 2>/dev/null")" && is_valid_ip "$IP"; then
     printf '%s' "$IP"
     exit 0
   fi