format docker, fix version, fix browser

2023-03-27 17:02:51 +02:00 · 2023-03-27 17:02:51 +02:00 · 3b10ef543f
commit 3b10ef543f
parent dd6ae18368
6 changed files with 559 additions and 544 deletions
--- a/docker/Almalinux.Dockerfile
+++ b/docker/Almalinux.Dockerfile
@ -1,4 +1,4 @@
-FROM    almalinux:9.1 AS base
+FROM almalinux:9 AS base

 ENV container docker
 RUN dnf -y install libgomp && \
@ -18,7 +18,7 @@ rm -f /lib/systemd/system/anaconda.target.wants/*;

 FROM base

-ARG FFPLAYOUT_VERSION=0.17.1
+ARG FFPLAYOUT_VERSION=0.17.0-beta7

 ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib

@ -35,10 +35,10 @@ RUN dnf install -y epel-release && \
 RUN \
    dnf update -y \
    && dnf install -y wget dejavu-sans-fonts sudo \
-    && wget -q -O /tmp/ffplayout_${FFPLAYOUT_VERSION}.x86_64.rpm "https://github.com/ffplayout/ffplayout/releases/download/v${VERSION}/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm" \
-    && yum install -y /tmp/ffplayout_${FFPLAYOUT_VERSION}.x86_64.rpm \
+    && wget -q -O /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm "https://github.com/ffplayout/ffplayout/releases/download/v${FFPLAYOUT_VERSION}/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm" \
+    && dnf install -y /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm \
    && dnf clean all \
-    && rm /tmp/ffplayout-${FFPLAYOUT_VERSION}.x86_64.rpm \
+    && rm /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm \
    && mkdir -p /home/ffpu && chown -R ffpu: /home/ffpu \
    && systemctl enable ffplayout \
    && systemctl enable ffpapi \
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -2,17 +2,17 @@ FROM    centos:7 AS base

 ENV container docker
 RUN yum -y install libgomp && \
-        yum clean all;
+    yum clean all

 RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \
-systemd-tmpfiles-setup.service ] || rm -f $i; done); \
-rm -f /lib/systemd/system/multi-user.target.wants/*;\
-rm -f /etc/systemd/system/*.wants/*;\
-rm -f /lib/systemd/system/local-fs.target.wants/*; \
-rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
-rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
-rm -f /lib/systemd/system/basic.target.wants/*;\
-rm -f /lib/systemd/system/anaconda.target.wants/*;
+    systemd-tmpfiles-setup.service ] || rm -f $i; done); \
+    rm -f /lib/systemd/system/multi-user.target.wants/*;\
+    rm -f /etc/systemd/system/*.wants/*;\
+    rm -f /lib/systemd/system/local-fs.target.wants/*; \
+    rm -f /lib/systemd/system/sockets.target.wants/*udev*; \
+    rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
+    rm -f /lib/systemd/system/basic.target.wants/*;\
+    rm -f /lib/systemd/system/anaconda.target.wants/*;


 FROM base AS build
@ -237,7 +237,7 @@ RUN \

 FROM base

-ARG FFPLAYOUT_VERSION=0.17.1
+ARG FFPLAYOUT_VERSION=0.17.0-beta7

 ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib

@ -248,10 +248,10 @@ ADD ./overide.conf /etc/systemd/system/ffplayout.service.d/overide.conf
 RUN \
    yum update -y \
    && yum install -y wget dejavu-sans-fonts sudo \
-    && wget -q -O /tmp/ffplayout_${FFPLAYOUT_VERSION}.x86_64.rpm "https://github.com/ffplayout/ffplayout/releases/download/v${VERSION}/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm" \
-    && yum install -y /tmp/ffplayout_${FFPLAYOUT_VERSION}.x86_64.rpm \
+    && wget -q -O /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm "https://github.com/ffplayout/ffplayout/releases/download/v${FFPLAYOUT_VERSION}/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm" \
+    && yum install -y /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm \
    && yum clean all \
-    && rm /tmp/ffplayout-${FFPLAYOUT_VERSION}.x86_64.rpm \
+    && rm /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm \
    && mkdir -p /home/ffpu && chown -R ffpu: /home/ffpu \
    && systemctl enable ffplayout \
    && systemctl enable ffpapi \
--- a/docker/fromSource.Dockerfile
+++ b/docker/fromSource.Dockerfile
@ -115,6 +115,7 @@ RUN     buildDeps="autoconf \
    # yum transaction as none of those packages are required for the rest of the build \
    yum history undo $(yum history info | grep 'Transaction ID' | awk -F: '{print$2}' | tr -d ' ') -y && \
    yum autoremove -y
+
 ## x264 http://www.videolan.org/developers/x264.html
 RUN \
    DIR=/tmp/x264 && \
@ -126,6 +127,7 @@ RUN \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ### x265 http://x265.org/
 RUN \
    DIR=/tmp/x265 && \
@ -139,6 +141,7 @@ RUN \
    ./multilib.sh && \
    make -C 8bit install && \
    rm -rf ${DIR}
+
 ### libogg https://www.xiph.org/ogg/
 RUN \
    DIR=/tmp/ogg && \
@ -151,6 +154,7 @@ RUN \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ### libopus https://www.opus-codec.org/
 RUN \
    DIR=/tmp/opus && \
@ -164,6 +168,7 @@ RUN \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ### libvorbis https://xiph.org/vorbis/
 RUN \
    DIR=/tmp/vorbis && \
@ -176,6 +181,7 @@ RUN \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ### libvpx https://www.webmproject.org/code/
 RUN \
    DIR=/tmp/vpx && \
@ -188,6 +194,7 @@ RUN \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ### libwebp https://developers.google.com/speed/webp/
 RUN \
    DIR=/tmp/vebp && \
@ -199,6 +206,7 @@ RUN \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ### libmp3lame http://lame.sourceforge.net/
 RUN \
    DIR=/tmp/lame && \
@ -210,6 +218,7 @@ RUN \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ### fdk-aac https://github.com/mstorsjo/fdk-aac
 RUN \
    DIR=/tmp/fdk-aac && \
@ -222,6 +231,7 @@ RUN \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ## openjpeg https://github.com/uclouvain/openjpeg
 RUN \
    DIR=/tmp/openjpeg && \
@ -233,6 +243,7 @@ RUN \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ## freetype https://www.freetype.org/
 RUN  \
    DIR=/tmp/freetype && \
@ -245,6 +256,7 @@ RUN  \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ## fridibi https://www.fribidi.org/
 RUN  \
    DIR=/tmp/fribidi && \
@ -259,6 +271,7 @@ RUN  \
    make -j1 && \
    make install && \
    rm -rf ${DIR}
+
 ## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/
 RUN  \
    DIR=/tmp/fontconfig && \
@ -270,6 +283,7 @@ RUN  \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ## libass https://github.com/libass/libass
 RUN  \
    DIR=/tmp/libass && \
@ -283,6 +297,7 @@ RUN  \
    make -j $(nproc | awk '{print $1 / 2}') && \
    make install && \
    rm -rf ${DIR}
+
 ## kvazaar https://github.com/ultravideo/kvazaar
 RUN \
    DIR=/tmp/kvazaar && \
@ -298,14 +313,14 @@ RUN \

 RUN \
    DIR=/tmp/aom && \
-        git clone --branch ${AOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \
-        cd ${DIR} ; \
-        rm -rf CMakeCache.txt CMakeFiles ; \
-        mkdir -p ./aom_build ; \
-        cd ./aom_build ; \
-        cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \
-        make ; \
-        make install ; \
+    git clone --branch ${AOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} && \
+    cd ${DIR} && \
+    rm -rf CMakeCache.txt CMakeFiles && \
+    mkdir -p ./aom_build && \
+    cd ./aom_build && \
+    cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 .. && \
+    make && \
+    make install && \
    rm -rf ${DIR}

 RUN \
@ -364,7 +379,7 @@ RUN  \
    curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
    tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \
    ./configure --disable-debug --disable-doc --disable-ffplay --enable-shared --enable-gpl --extra-libs=-ldl && \
-        make ;  make install
+    make && make install

 ## Build ffmpeg https://ffmpeg.org/
 RUN  \
@ -421,7 +436,7 @@ RUN \

 FROM base

-ARG FFPLAYOUT_VERSION=0.17.1
+ARG FFPLAYOUT_VERSION=0.17.0-beta7

 ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib

@ -432,8 +447,8 @@ ADD ./overide.conf /etc/systemd/system/ffplayout.service.d/overide.conf
 RUN \
    yum update -y \
    && yum install -y wget dejavu-sans-fonts sudo \
-    && wget -q -O /tmp/ffplayout_${FFPLAYOUT_VERSION}.x86_64.rpm "https://github.com/ffplayout/ffplayout/releases/download/v${VERSION}/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm" \
-    && yum install -y /tmp/ffplayout_${FFPLAYOUT_VERSION}.x86_64.rpm \
+    && wget -q -O /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm "https://github.com/ffplayout/ffplayout/releases/download/v${FFPLAYOUT_VERSION}/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm" \
+    && yum install -y /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm \
    && yum clean all \
    && rm /tmp/ffplayout-${FFPLAYOUT_VERSION}.x86_64.rpm \
    && mkdir -p /home/ffpu && chown -R ffpu: /home/ffpu \
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 4dc932635dba4b96479ffa1a29fec71d113a99a7
+Subproject commit 99339155ebb01e598fb42bd09456445efde867c8
--- a/scripts/build.sh
+++ b/scripts/build.sh
@ -44,7 +44,7 @@ for target in "${targets[@]}"; do

        cp ./target/${target}/release/ffpapi.exe .
        cp ./target/${target}/release/ffplayout.exe .
-        zip -r "ffplayout-v${version}_${target}.zip" assets docs public LICENSE README.md CHANGELOG.md ffplayout.exe ffpapi.exe -x *.db
+        zip -r "ffplayout-v${version}_${target}.zip" assets docker docs public LICENSE README.md CHANGELOG.md ffplayout.exe ffpapi.exe -x *.db
        rm -f ffplayout.exe ffpapi.exe
    elif [[ $target == "x86_64-apple-darwin" ]] || [[ $target == "aarch64-apple-darwin" ]]; then
        if [[ -f "ffplayout-v${version}_${target}.tar.gz" ]]; then
@ -62,7 +62,7 @@ for target in "${targets[@]}"; do

        cp ./target/${target}/release/ffpapi .
        cp ./target/${target}/release/ffplayout .
-        tar -czvf "ffplayout-v${version}_${target}.tar.gz" --exclude='*.db' --exclude='*.db-shm' --exclude='*.db-wal' assets docs public LICENSE README.md CHANGELOG.md ffplayout ffpapi
+        tar -czvf "ffplayout-v${version}_${target}.tar.gz" --exclude='*.db' --exclude='*.db-shm' --exclude='*.db-wal' assets docker docs public LICENSE README.md CHANGELOG.md ffplayout ffpapi
        rm -f ffplayout ffpapi
    else
        if [[ -f "ffplayout-v${version}_${target}.tar.gz" ]]; then
@ -73,7 +73,7 @@ for target in "${targets[@]}"; do

        cp ./target/${target}/release/ffpapi .
        cp ./target/${target}/release/ffplayout .
-        tar -czvf "ffplayout-v${version}_${target}.tar.gz" --exclude='*.db' --exclude='*.db-shm' --exclude='*.db-wal' assets docs public LICENSE README.md CHANGELOG.md ffplayout ffpapi
+        tar -czvf "ffplayout-v${version}_${target}.tar.gz" --exclude='*.db' --exclude='*.db-shm' --exclude='*.db-wal' assets docker docs public LICENSE README.md CHANGELOG.md ffplayout ffpapi
        rm -f ffplayout ffpapi
    fi