From 429f38b56134ee7d41d9f46911e4dba165c20657 Mon Sep 17 00:00:00 2001 From: vaverix Date: Thu, 18 Jul 2024 05:33:15 +0200 Subject: [PATCH 1/8] Create docker-compose.yml --- docker-compose.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..cc111b3 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,10 @@ +version: '3' +services: + srt: + image: ghcr.io/nerdcubed/srt-server-docker/srt-server:6c9570e + ports: + - "8100:8080/udp" + volumes: + - type: bind + source: /DATA/AppData/sls/sls.conf + target: /etc/sls/sls.conf From a2a506727b6ef88a4adaf2dfd3c634ef0b525363 Mon Sep 17 00:00:00 2001 From: vaverix Date: Thu, 18 Jul 2024 05:35:25 +0200 Subject: [PATCH 2/8] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c9958c4..d81c669 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # srt-server-docker A Docker container for srt-live-server https://github.com/Edward-Wu/srt-live-server +Added docker-compose.yml From acf3bb6e513ac0a25b99d2acf527057b0adcda60 Mon Sep 17 00:00:00 2001 From: vaverix Date: Thu, 18 Jul 2024 05:49:45 +0200 Subject: [PATCH 3/8] Update Dockerfile --- Dockerfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3834540..02f94ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,12 @@ FROM alpine:latest as build # Define version args -ARG SRT_VERSION=v1.4.2 +ARG SRT_VERSION=v1.5.3 ARG SLS_VERSION=V1.4.8 # Install build dependencies RUN apk update +RUN apk upgrade RUN apk add --no-cache \ linux-headers \ alpine-sdk \ @@ -14,6 +15,10 @@ RUN apk add --no-cache \ tcl \ openssl-dev \ zlib-dev +RUN apk add tclsh \ + pkg-config \ + libssl-dev \ + build-essential # Clone projects WORKDIR /source From 46284c7cf1fc520060bff3d94577f63c9dba3e7c Mon Sep 17 00:00:00 2001 From: vaverix Date: Thu, 18 Jul 2024 05:51:16 +0200 Subject: [PATCH 4/8] Update Dockerfile --- Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 02f94ab..a51279d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,10 +15,6 @@ RUN apk add --no-cache \ tcl \ openssl-dev \ zlib-dev -RUN apk add tclsh \ - pkg-config \ - libssl-dev \ - build-essential # Clone projects WORKDIR /source From 00b32f11934666d0b96b0bf69f40ac439805d86b Mon Sep 17 00:00:00 2001 From: vaverix Date: Fri, 16 Aug 2024 00:45:40 +0200 Subject: [PATCH 5/8] Update Dockerfile (fix build / no ctime header) --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index a51279d..395edb7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -28,6 +28,7 @@ RUN make install # Compile SLS WORKDIR /source/sls +RUN echo "#include "|cat - slscore/common.cpp > /tmp/out && mv /tmp/out slscore/common.cpp RUN make # Entry image From 8e846544c09a0deaf42e5fe873e8183957a4492d Mon Sep 17 00:00:00 2001 From: vaverix Date: Fri, 16 Aug 2024 00:50:57 +0200 Subject: [PATCH 6/8] Update Dockerfile (fix build) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 395edb7..0ab7434 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,7 @@ RUN apk update && \ # Copy SRT libraries COPY --from=build /usr/local/bin/srt-* /usr/local/bin/ -COPY --from=build /usr/local/lib64/libsrt* /usr/local/lib64/ +COPY --from=build /usr/local/lib/libsrt* /usr/local/lib/ # Copy SLS binary COPY --from=build /source/sls/bin/* /usr/local/bin/ From eca522e00d6d14749fa5dcb3dca60dd63e97f068 Mon Sep 17 00:00:00 2001 From: vaverix Date: Fri, 16 Aug 2024 06:27:27 +0200 Subject: [PATCH 7/8] Experimental (try community build) --- Dockerfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0ab7434..5e4e2a6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM alpine:latest as build # Define version args ARG SRT_VERSION=v1.5.3 -ARG SLS_VERSION=V1.4.8 +ARG SLS_VERSION=master # Install build dependencies RUN apk update @@ -19,7 +19,7 @@ RUN apk add --no-cache \ # Clone projects WORKDIR /source RUN git clone --branch ${SRT_VERSION} https://github.com/Haivision/srt.git srt -RUN git clone --branch ${SLS_VERSION} https://github.com/Edward-Wu/srt-live-server.git sls +RUN git clone --branch ${SLS_VERSION} https://github.com/irlserver/irl-srt-server.git sls # Compile SRT WORKDIR /source/srt @@ -28,8 +28,9 @@ RUN make install # Compile SLS WORKDIR /source/sls -RUN echo "#include "|cat - slscore/common.cpp > /tmp/out && mv /tmp/out slscore/common.cpp -RUN make +RUN git submodule update --init +RUN cmake . -DCMAKE_BUILD_TYPE=Release +RUN make -j8 # Entry image FROM alpine:latest @@ -49,7 +50,7 @@ COPY --from=build /usr/local/lib/libsrt* /usr/local/lib/ # Copy SLS binary COPY --from=build /source/sls/bin/* /usr/local/bin/ -COPY sls.conf /etc/sls/ +COPY src/sls.conf /etc/sls/ # Use non-root user USER srt @@ -57,5 +58,5 @@ WORKDIR /home/srt # Define entrypoint VOLUME /logs -EXPOSE 1935/udp -ENTRYPOINT ["sls", "-c", "/etc/sls/sls.conf"] +EXPOSE 8080 8181 1935/udp 1936/udp +ENTRYPOINT [ "srt_server", "-c", "/etc/sls/sls.conf"] From facc79ef223b91e28419f23962404022f2c67e27 Mon Sep 17 00:00:00 2001 From: vaverix Date: Fri, 16 Aug 2024 06:29:30 +0200 Subject: [PATCH 8/8] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 5e4e2a6..3bec514 100644 --- a/Dockerfile +++ b/Dockerfile @@ -50,7 +50,7 @@ COPY --from=build /usr/local/lib/libsrt* /usr/local/lib/ # Copy SLS binary COPY --from=build /source/sls/bin/* /usr/local/bin/ -COPY src/sls.conf /etc/sls/ +COPY sls.conf /etc/sls/ # Use non-root user USER srt