From 62bf205da287bf6a4bceb1d3c3ed5d477f4524f5 Mon Sep 17 00:00:00 2001 From: josep-tecnativa Date: Wed, 28 Feb 2024 16:48:46 +0100 Subject: [PATCH] [FIX] Temporal fix meanwhile odoo uses -intra option in ffmpeg. This option is not compatible with ffmpeg lasts versions --- 16.0.Dockerfile | 6 +++++- 17.0.Dockerfile | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/16.0.Dockerfile b/16.0.Dockerfile index b41dbc3b..c7e545f3 100644 --- a/16.0.Dockerfile +++ b/16.0.Dockerfile @@ -49,7 +49,6 @@ RUN echo "LAST_SYSTEM_UID=$LAST_SYSTEM_UID\nLAST_SYSTEM_GID=$LAST_SYSTEM_GID\nFI && apt-get install -yqq --no-install-recommends \ ./wkhtmltox.deb \ chromium \ - ffmpeg \ fonts-liberation2 \ gettext \ git \ @@ -60,6 +59,11 @@ RUN echo "LAST_SYSTEM_UID=$LAST_SYSTEM_UID\nLAST_SYSTEM_GID=$LAST_SYSTEM_GID\nFI openssh-client \ telnet \ vim +#Temporal fix +RUN curl -LO http://ftp.debian.org/debian/pool/main/f/ffmpeg/ffmpeg_4.3.6-0+deb11u1_amd64.deb \ + && dpkg -i ffmpeg-doc_4.3.6-0+deb11u1_all.deb \ + || apt-get -f install -y \ + && rm -rf ffmpeg-doc_4.3.6-0+deb11u1_all.deb RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main' >> /etc/apt/sources.list.d/postgresql.list \ && curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && apt-get update \ diff --git a/17.0.Dockerfile b/17.0.Dockerfile index 432cf503..b34c30fb 100644 --- a/17.0.Dockerfile +++ b/17.0.Dockerfile @@ -49,7 +49,6 @@ RUN echo -e "LAST_SYSTEM_UID=$LAST_SYSTEM_UID\nLAST_SYSTEM_GID=$LAST_SYSTEM_GID\ && apt-get install -yqq --no-install-recommends \ ./wkhtmltox.deb \ chromium \ - ffmpeg \ fonts-liberation2 \ gettext \ git \ @@ -60,6 +59,11 @@ RUN echo -e "LAST_SYSTEM_UID=$LAST_SYSTEM_UID\nLAST_SYSTEM_GID=$LAST_SYSTEM_GID\ openssh-client \ telnet \ vim +#Temporal fix +RUN curl -LO http://ftp.debian.org/debian/pool/main/f/ffmpeg/ffmpeg_4.3.6-0+deb11u1_amd64.deb \ + && dpkg -i ffmpeg-doc_4.3.6-0+deb11u1_all.deb \ + || apt-get -f install -y \ + && rm -rf ffmpeg-doc_4.3.6-0+deb11u1_all.deb RUN echo 'deb http://apt.postgresql.org/pub/repos/apt/ bookworm-pgdg main' >> /etc/apt/sources.list.d/postgresql.list \ && curl -SL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \ && apt-get update \