djsundog/ffplayout
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup, optional use local rpm file

Browse Source
This commit is contained in:
jb-alvarado 2023-03-28 10:23:20 +02:00
parent 022ee4fddb
commit 46ae4f6460
3 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
docker/Almalinux.Dockerfile
View File

@ -5,45 +5,38 @@ RUN dnf -y install libgomp && \
dnf clean all; dnf clean all;
RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \ RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \
systemd-tmpfiles-setup.service ] || rm -f $i; done); \ systemd-tmpfiles-setup.service ] || rm -f $i; done); \
rm -f /lib/systemd/system/multi-user.target.wants/*;\ rm -f /lib/systemd/system/multi-user.target.wants/*; \
rm -f /etc/systemd/system/*.wants/*;\ rm -f /etc/systemd/system/*.wants/*; \
rm -f /lib/systemd/system/local-fs.target.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/*udev*; \
rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
rm -f /lib/systemd/system/basic.target.wants/*;\ rm -f /lib/systemd/system/basic.target.wants/*; \
rm -f /lib/systemd/system/anaconda.target.wants/*; rm -f /lib/systemd/system/anaconda.target.wants/*
FROM base FROM base
ARG FFPLAYOUT_VERSION=0.17.0-beta7 ARG FFPLAYOUT_VERSION=0.17.0-beta7
COPY README.md *.rpm /tmp/
ENV LD_LIBRARY_PATH=/usr/local/lib64:/usr/local/lib RUN echo $(ls /tmp/)
ADD ./overide.conf /etc/systemd/system/ffplayout.service.d/overide.conf RUN dnf update -y && \
ADD ./overide.conf /etc/systemd/system/ffpapi.service.d/overide.conf dnf install -y epel-release && \
RUN dnf install -y epel-release && \
dnf install -y 'dnf-command(config-manager)' && \ dnf install -y 'dnf-command(config-manager)' && \
dnf config-manager --set-enabled crb && \ dnf config-manager --set-enabled crb && \
dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm && \ dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/free/el/rpmfusion-free-release-$(rpm -E %rhel).noarch.rpm && \
dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm && \ dnf install -y --nogpgcheck https://mirrors.rpmfusion.org/nonfree/el/rpmfusion-nonfree-release-$(rpm -E %rhel).noarch.rpm && \
dnf install -y ffmpeg ffmpeg-devel dnf install -y ffmpeg ffmpeg-devel wget dejavu-sans-fonts sudo && \
dnf clean all
RUN \ RUN [[ -f /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm ]] || wget -q "https://github.com/ffplayout/ffplayout/releases/download/v${FFPLAYOUT_VERSION}/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm" -P /tmp/ && \
dnf update -y \ dnf install -y /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm && \
&& dnf install -y wget dejavu-sans-fonts sudo \ rm /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.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" \ mkdir -p /home/ffpu && chown -R ffpu: /home/ffpu && \
&& dnf install -y /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm \ systemctl enable ffplayout && \
&& dnf clean all \ systemctl enable ffpapi && \
&& rm /tmp/ffplayout-${FFPLAYOUT_VERSION}-1.x86_64.rpm \ ffpapi -u admin -p admin -m contact@example.com
&& mkdir -p /home/ffpu && chown -R ffpu: /home/ffpu \
&& systemctl enable ffplayout \
&& systemctl enable ffpapi \
&& ffpapi -u admin -p admin -m contact@example.com
EXPOSE 8787 EXPOSE 8787

14
docker/Dockerfile
View File

@ -6,20 +6,18 @@ RUN yum -y install libgomp && \
RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \ RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \
systemd-tmpfiles-setup.service ] || rm -f $i; done); \ systemd-tmpfiles-setup.service ] || rm -f $i; done); \
rm -f /lib/systemd/system/multi-user.target.wants/*;\ rm -f /lib/systemd/system/multi-user.target.wants/*; \
rm -f /etc/systemd/system/*.wants/*;\ rm -f /etc/systemd/system/*.wants/*; \
rm -f /lib/systemd/system/local-fs.target.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/*udev*; \
rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
rm -f /lib/systemd/system/basic.target.wants/*;\ rm -f /lib/systemd/system/basic.target.wants/*; \
rm -f /lib/systemd/system/anaconda.target.wants/*; rm -f /lib/systemd/system/anaconda.target.wants/*
FROM base AS build FROM base AS build
WORKDIR /tmp/workdir WORKDIR /tmp/workdir
ENV FFMPEG_VERSION=5.1.2 \ ENV FFMPEG_VERSION=5.1.2 \
AOM_VERSION=v1.0.0 \ AOM_VERSION=v1.0.0 \
LIBASS_VERSION=0.13.7 \ LIBASS_VERSION=0.13.7 \
@ -38,7 +36,6 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconfig:/opt/
ARG PREFIX=/opt/ffmpeg ARG PREFIX=/opt/ffmpeg
ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64" ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64"
RUN buildDeps="autoconf \ RUN buildDeps="autoconf \
automake \ automake \
bzip2 \ bzip2 \
@ -97,7 +94,6 @@ RUN buildDeps="autoconf \
yum history undo $(yum history info | grep 'Transaction ID' | awk -F: '{print$2}' | tr -d ' ') -y && \ yum history undo $(yum history info | grep 'Transaction ID' | awk -F: '{print$2}' | tr -d ' ') -y && \
yum autoremove -y yum autoremove -y
RUN yum -y install \ RUN yum -y install \
lame-libs \ lame-libs \
openjpeg-libs \ openjpeg-libs \
@ -138,6 +134,7 @@ RUN \
make -j $(nproc | awk '{print $1 / 2}') && \ make -j $(nproc | awk '{print $1 / 2}') && \
make install && \ make install && \
rm -rf ${DIR} rm -rf ${DIR}
## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ ## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/
RUN \ RUN \
DIR=/tmp/fontconfig && \ DIR=/tmp/fontconfig && \
@ -149,6 +146,7 @@ RUN \
make -j $(nproc | awk '{print $1 / 2}') && \ make -j $(nproc | awk '{print $1 / 2}') && \
make install && \ make install && \
rm -rf ${DIR} rm -rf ${DIR}
## libass https://github.com/libass/libass ## libass https://github.com/libass/libass
RUN \ RUN \
DIR=/tmp/libass && \ DIR=/tmp/libass && \

19
docker/fromSource.Dockerfile
View File

@ -5,21 +5,19 @@ RUN yum -y install libgomp && \
yum clean all; yum clean all;
RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \ RUN (cd /lib/systemd/system/sysinit.target.wants/; for i in *; do [ $i == \
systemd-tmpfiles-setup.service ] || rm -f $i; done); \ systemd-tmpfiles-setup.service ] || rm -f $i; done); \
rm -f /lib/systemd/system/multi-user.target.wants/*;\ rm -f /lib/systemd/system/multi-user.target.wants/*; \
rm -f /etc/systemd/system/*.wants/*;\ rm -f /etc/systemd/system/*.wants/*; \
rm -f /lib/systemd/system/local-fs.target.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/*udev*; \
rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \ rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
rm -f /lib/systemd/system/basic.target.wants/*;\ rm -f /lib/systemd/system/basic.target.wants/*; \
rm -f /lib/systemd/system/anaconda.target.wants/*; rm -f /lib/systemd/system/anaconda.target.wants/*
FROM base AS build FROM base AS build
WORKDIR /tmp/workdir WORKDIR /tmp/workdir
ENV FFMPEG_VERSION=5.1.2 \ ENV FFMPEG_VERSION=5.1.2 \
AOM_VERSION=v1.0.0 \ AOM_VERSION=v1.0.0 \
FDKAAC_VERSION=0.1.5 \ FDKAAC_VERSION=0.1.5 \
@ -57,7 +55,6 @@ ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconfig:/opt/
ARG PREFIX=/opt/ffmpeg ARG PREFIX=/opt/ffmpeg
ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64" ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64"
RUN buildDeps="autoconf \ RUN buildDeps="autoconf \
automake \ automake \
bzip2 \ bzip2 \