From 216c0da73afa04a001f1bb45ec116a9fc8308f37 Mon Sep 17 00:00:00 2001 From: Adolfo Delorenzo Date: Fri, 20 Jan 2023 23:40:33 +0000 Subject: [PATCH] updates --- Dockerfile | 9 +++++++-- docker-compose.yaml | 2 +- html/index.html | 2 +- test.yaml | 35 +++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 test.yaml diff --git a/Dockerfile b/Dockerfile index 5f2000d..bc66101 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ RUN apt-get update && \ openssl libssl-dev yasm \ libpcre3-dev librtmp-dev libtheora-dev \ libvorbis-dev libvpx-dev libfreetype6-dev \ - libmp3lame-dev libx264-dev libx265-dev lighttpd && \ + libmp3lame-dev libx264-dev libx265-dev && \ rm -rf /var/lib/apt/lists/* @@ -93,6 +93,10 @@ RUN apt-get update && \ libvpx4 libx264-dev libx265-dev && \ rm -rf /var/lib/apt/lists/* +# Install lighttpd +RUN apt-get update && \ + apt-get install -y lighttpd + # Copy files from build stage to final stage COPY --from=builder /usr/local /usr/local COPY --from=builder /etc/nginx /etc/nginx @@ -115,4 +119,5 @@ EXPOSE 1935 EXPOSE 8080 EXPOSE 80 -CMD ["nginx", "-g", "daemon off;"] +#CMD ["nginx", "-g", "daemon off;"] +CMD ["lighttpd", "-f", "/etc/lighttpd/lighttpd.conf", "&&", "nginx", "-g", "daemon off;"] diff --git a/docker-compose.yaml b/docker-compose.yaml index 56b0e90..df96175 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,6 +1,6 @@ version: '3.3' services: - adelorenzo: + rtmp-adr: ports: - '1935:1935' - '8080:8080' diff --git a/html/index.html b/html/index.html index 15d95b4..76db266 100644 --- a/html/index.html +++ b/html/index.html @@ -9,7 +9,7 @@

HLS Player