Skip to content

Commit 4d6f4a0

Browse files
committed
Get PIP caches from ghcr.io/sippy/sippy-wheelset.
1 parent 7fef081 commit 4d6f4a0

4 files changed

Lines changed: 25 additions & 5 deletions

File tree

.github/workflows/.rtp.io.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@ on:
2020
rtpp-tag:
2121
required: false
2222
type: string
23-
default: debian_12-slim
23+
default: debian_13-slim
24+
pipcache-repo:
25+
required: false
26+
type: string
27+
default: ghcr.io/sippy/b2bua/sippy-wheelset:latest
2428

2529
jobs:
2630
get_container_platforms:
@@ -81,6 +85,7 @@ jobs:
8185
packages: write
8286
env:
8387
BASE_IMAGE: ${{ inputs.rtpp-repo }}-${{ inputs.rtpp-tag }}
88+
PIPCACHE_IMAGE: ${{ inputs.pipcache-repo }}-${{ inputs.rtpp-tag }}
8489
BUILD_OS: ${{ needs.set_env.outputs.build-os }}
8590
PLATFORMS: ${{ needs.set_env.outputs.platforms }}
8691
BUILD_IMAGE: ${{ needs.set_env.outputs.build-image }}
@@ -154,6 +159,7 @@ jobs:
154159
file: ./docker/Dockerfile.rtp.io
155160
build-args: |
156161
BASE_IMAGE=${{ env.BASE_IMAGE }}
162+
PIPCACHE_IMAGE=${{ env.PIPCACHE_IMAGE }}
157163
BUILD_OS=${{ env.BUILD_OS }}
158164
LLVM_VER=${{ inputs.llvm-version }}
159165
LLVM_VER_OLD=${{ inputs.llvm-version-old }}
@@ -174,6 +180,7 @@ jobs:
174180
platform: ${{ fromJSON(needs.set_env.outputs.build-matrix) }}
175181
env:
176182
BASE_IMAGE: ${{ inputs.rtpp-repo }}-${{ inputs.rtpp-tag }}
183+
PIPCACHE_IMAGE: ${{ inputs.pipcache-repo }}-${{ inputs.rtpp-tag }}
177184
BUILD_OS: ${{ needs.set_env.outputs.build-os }}
178185

179186
steps:
@@ -226,6 +233,7 @@ jobs:
226233
file: ./docker/Dockerfile.rtp.io
227234
build-args: |
228235
BASE_IMAGE=${{ env.BASE_IMAGE }}
236+
PIPCACHE_IMAGE=${{ env.PIPCACHE_IMAGE }}
229237
BUILD_OS=${{ env.BUILD_OS }}
230238
LLVM_VER=${{ inputs.llvm-version }}
231239
LLVM_VER_OLD=${{ inputs.llvm-version-old }}

.github/workflows/rtp.io.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ jobs:
129129
strategy:
130130
fail-fast: false
131131
matrix:
132-
rtpp-tag: [debian_12-slim, ubuntu_latest]
132+
rtpp-tag: [debian_13-slim, ubuntu_latest]
133133

134134
all_done:
135135
needs: build_test_rtp_io_dock

docker/Dockerfile.rtp.io

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# syntax=docker/dockerfile:1.7-labs
22

33
ARG BASE_IMAGE="sippylabs/rtpproxy:latest"
4-
FROM --platform=$TARGETPLATFORM $BASE_IMAGE AS build
4+
ARG PIPCACHE_IMAGE="scratch"
5+
FROM --platform=$TARGETPLATFORM $BASE_IMAGE AS base
56
LABEL maintainer="Maksym Sobolyev <sobomax@sippysoft.com>"
67

78
USER root
@@ -11,6 +12,18 @@ ENV DEBIAN_FRONTEND=noninteractive
1112

1213
WORKDIR /src
1314

15+
ENV CACHE_HOME="/root"
16+
ENV CACHE_ROOT="${CACHE_HOME}/.cache"
17+
RUN mkdir -p ${CACHE_ROOT}
18+
19+
FROM ${PIPCACHE_IMAGE} AS cache
20+
COPY --from=base /root/.cache/ /root/.cache/
21+
22+
FROM base AS build
23+
COPY --from=cache /root/.cache /root/.cache
24+
25+
RUN find /root/.cache -type f
26+
1427
ARG LLVM_VER=18
1528
ARG LLVM_VER_OLD=16
1629
ARG TARGETPLATFORM
@@ -24,7 +37,6 @@ RUN --mount=type=bind,source=scripts/build,target=scripts/build \
2437
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
2538
apt-get install -y gpp python-is-python3 python3-pip
2639
RUN --mount=type=bind,source=dist/voiptests/requirements.txt,target=requirements.txt \
27-
--mount=type=cache,target=/root/.cache/pip,sharing=locked \
2840
python -m pip install --break-system-packages -U -r requirements.txt
2941

3042
COPY --exclude=.git --exclude=.github --exclude=docker --exclude=dist \

scripts/build/get-arch-buildargs.rtp.io

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ platformopts() {
4040
debian:*)
4141
case "${TARGETPLATFORM}" in
4242
linux/ppc64le | linux/arm/v7 | linux/mips64le | linux/arm/v5)
43-
out="COMPILER=clang-${LLVM_VER_OLD} LINKER=lld-${LLVM_VER_OLD}"
43+
#out="COMPILER=clang-${LLVM_VER_OLD} LINKER=lld-${LLVM_VER_OLD}"
4444
;;
4545
esac
4646
;;

0 commit comments

Comments
 (0)