From e6fd96fe663aa6cf54c3994e590e3e8ea26aa54b Mon Sep 17 00:00:00 2001
From: Maksym Sobolyev <sobomax@sippysoft.com>
Date: Wed, 24 Jul 2024 20:28:36 -0700
Subject: [PATCH] + 1b33894a0293dd5

---
 .github/workflows/rtpproxy_ci.yml | 2 +-
 docker/Dockerfile                 | 6 +++---
 docker/install_depends.sh         | 7 +++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rtpproxy_ci.yml b/.github/workflows/rtpproxy_ci.yml
index fa1f56637..43e5b93a5 100644
--- a/.github/workflows/rtpproxy_ci.yml
+++ b/.github/workflows/rtpproxy_ci.yml
@@ -404,7 +404,7 @@ jobs:
         ports:
           - 5000:5000
     env:
-      CLANG_VER: 16
+      CLANG_VER: 18
       DOCKER_REPO: sippylabs/rtpproxy
       LOCAL_REPO: localhost:5000/sippylabs/rtpproxy
       PLATFORMS: linux/amd64,linux/i386,linux/arm/v7,linux/arm64
diff --git a/docker/Dockerfile b/docker/Dockerfile
index de6c2079e..30d1d2810 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,9 +17,9 @@ ENV DEBIAN_FRONTEND=noninteractive
 # Build & install everything
 ARG LIB_DEPS="libsrtp2-1 libbcg729-0 libgsm1 libsndfile1 libunwind8 libssl3"
 ARG CLANG_VER=15
-ARG BUILD_DEPS="file pkg-config clang-${CLANG_VER} llvm-${CLANG_VER} ccache git make \
- libsrtp2-dev libbcg729-dev libgsm1-dev libsndfile1-dev \
- libunwind-dev libssl-dev"
+ARG BUILD_DEPS="file pkg-config clang-${CLANG_VER} llvm-${CLANG_VER} lld-${CLANG_VER} \
+ ccache git make libsrtp2-dev libbcg729-dev libgsm1-dev libsndfile1-dev \
+ libunwind-dev libssl-dev curl gpg"
 
 WORKDIR /tmp
 ARG APT_INSTALL="apt-get install --no-install-recommends -y"
diff --git a/docker/install_depends.sh b/docker/install_depends.sh
index bec843042..23ff6bbb6 100755
--- a/docker/install_depends.sh
+++ b/docker/install_depends.sh
@@ -6,6 +6,13 @@ set -x
 MYPATH="`realpath "${0}"`"
 RTPDIR="`dirname "${MYPATH}"`/.."
 
+if [ ${CLANG_VER} -gt 16 ]
+then
+  ${APT_INSTALL} curl gpg
+  echo "deb [signed-by=/usr/share/keyrings/llvm.gpg] http://apt.llvm.org/bookworm/ llvm-toolchain-bookworm-${CLANG_VER} main" > /etc/apt/sources.list.d/llvm.list
+  curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor > /usr/share/keyrings/llvm.gpg
+fi
+
 apt-get -y update -qq
 
 ${APT_INSTALL} ${LIB_DEPS} ${BUILD_DEPS}