From 4c1e9b1e748e48180e60f97fcb0ff8f184b50711 Mon Sep 17 00:00:00 2001 From: Thomas Lekanger Date: Thu, 18 Apr 2024 19:15:32 +0200 Subject: [PATCH] fix: test using irltk fork --- Dockerfile | 8 ++++---- README.md | 3 +-- files/supervisord.conf | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4a3e21b..36b9581 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:3.18 as builder RUN apk update &&\ apk upgrade &&\ - apk add --no-cache linux-headers alpine-sdk cmake tcl openssl-dev zlib-dev + apk add --no-cache linux-headers alpine-sdk cmake tcl openssl-dev zlib-dev spdlog spdlog-dev WORKDIR /tmp @@ -20,14 +20,14 @@ RUN mkdir -p /build; \ # belabox patched srtla # -ARG SRTLA_VERSION=main +ARG SRTLA_VERSION=irltk-fork RUN mkdir -p /build; \ - git clone https://github.com/IRLServer/srtla.git /build/srtla; \ + git clone https://github.com/IRLToolkit/srtla.git /build/srtla; \ cd /build/srtla; \ git checkout $SRTLA_VERSION; \ make -j${nproc}; -RUN cp /build/srtla/srtla_rec /build/srtla/srtla_send /usr/local/bin +RUN cp /build/srtla/irltk_srtla_rec /usr/local/bin/srtla_rec # I honestly don't know why this is needed after rebasing with mainstream SRT RUN cp /build/srt/srtcore/srt_compat.h /usr/local/include/srt/ diff --git a/README.md b/README.md index 9abd548..df44bc4 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,7 @@ Work in progress. A few streamers i know are personally using this image for the **WARNING: This is not an official Belabox project. Please don't spam rationalirl about it!** We using the following great open-source projects: -- srtla_rec from https://github.com/BELABOX -- srt-live-transmit from https://github.com/BELABOX +- srtla_rec from https://github.com/IRLToolkit/srtla/tree/irltk-fork - irl-srt-server (srt-live-server fork) from https://github.com/IRLServer/irl-srt-server ## Manual diff --git a/files/supervisord.conf b/files/supervisord.conf index 74d041b..e4dd6f2 100644 --- a/files/supervisord.conf +++ b/files/supervisord.conf @@ -39,7 +39,7 @@ stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 -command=/bin/sh -c "sleep 3 && /usr/local/bin/srtla_rec 5000 localhost 8282" +command=/bin/sh -c "sleep 3 && /usr/local/bin/srtla_rec --srtla_port=5000 --srt_hostname=localhost --srt_port=8282 --verbose" [program:server] priority=200