Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
sobomax committed Jul 25, 2024
1 parent 6ee6164 commit f53a222
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rtpproxy_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 8 additions & 0 deletions docker/install_depends.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,12 @@ RTPDIR="`dirname "${MYPATH}"`/.."

apt-get -y update -qq

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
apt-get -y update -qq
fi

${APT_INSTALL} ${LIB_DEPS} ${BUILD_DEPS}

0 comments on commit f53a222

Please sign in to comment.