Skip to content

Commit

Permalink
Include libg722 when building docker image.
Browse files Browse the repository at this point in the history
  • Loading branch information
sobomax committed Jul 29, 2024
1 parent 4271be5 commit c81518d
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
3 changes: 3 additions & 0 deletions .github/workflows/rtpproxy_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,8 @@ jobs:
echo "CCACHE_IMAGE=${CCACHE_IMAGE}" >> $GITHUB_ENV
echo "CCACHE_BIMAGE=${CCACHE_BIMAGE}" >> $GITHUB_ENV
echo "BUILD_IMAGE=${{ env.LOCAL_REPO }}:latest" >> $GITHUB_ENV
OS_TAG="`echo ${BASE_IMAGE} | sed 's|:|_|g'`"
echo "LIBG722_IMAGE=sippylabs/libg722:latest-${OS_TAG}" >> $GITHUB_ENV
- name: Build Docker image
uses: docker/build-push-action@v6
Expand All @@ -473,6 +475,7 @@ jobs:
CLANG_VER_OLD=${{ env.CLANG_VER_OLD }}
CLANG_VER_NEW=${{ env.CLANG_VER_NEW }}
BASE_IMAGE=${{ env.BASE_IMAGE }}
LIBG722_IMAGE=${{ env.LIBG722_IMAGE }}
CCACHE_IMAGE=${{ env.CCACHE_BIMAGE }}
CCACHE_ROOT=${{ env.CCACHE_ROOT }}
tags: ${{ env.BUILD_IMAGE }}
Expand Down
6 changes: 5 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# syntax=docker/dockerfile:1.7-labs

ARG BASE_IMAGE
ARG BASE_IMAGE=debian:sid-slim
ARG LIBG722_IMAGE=sippylabs/libg722:latest-debian_sid-slim
ARG CCACHE_IMAGE=scratch
FROM ${LIBG722_IMAGE} AS libg722
FROM ${BASE_IMAGE} AS build
RUN mkdir -p /rtpproxy/ccache
FROM ${CCACHE_IMAGE} AS ccache
Expand Down Expand Up @@ -31,6 +33,8 @@ COPY docker/install_depends.sh /tmp
COPY docker/clang_ver.sub /tmp/docker/clang_ver.sub
ARG TARGETPLATFORM
RUN ./install_depends.sh
COPY --from=libg722 /usr/local/lib/libg722.* /usr/local/lib/
COPY --from=libg722 /usr/local/include/g722* /usr/local/include/

COPY --exclude=.git* --link . /rtpproxy/

Expand Down

0 comments on commit c81518d

Please sign in to comment.