From 1cc5aebe37b00c4ca2ac9480f991f995d5b28b6a Mon Sep 17 00:00:00 2001 From: Youngbin Han Date: Thu, 31 Mar 2022 11:02:41 +0000 Subject: [PATCH] Use Ubuntu 20.04 LTS on Docker image - Use Ubuntu 20.04 LTS as base image to pull newer packages - Remove ffmpeg PPA and PPA tools: As Ubuntu 20.04 brings ffmepg 4.2.x+ - python-is-python3: Simple package that symlinks python -> python3 - DEBIAN_FRONTEND=noninteractive: This disables all user-interactive prompt when using package tools. --- Dockerfile | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index d44ae30..53a74b7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,14 +1,11 @@ -ARG FFMPEG_VERSION=4.2.2 - -FROM ubuntu:bionic -ARG FFMPEG_VERSION +FROM ubuntu:focal +ARG DEBIAN_FRONTEND=noninteractive WORKDIR /usr/src/app -RUN apt-get update && apt-get install -y software-properties-common && apt-get update && add-apt-repository ppa:jonathonf/ffmpeg-4 - RUN ln -s -f /bin/true /usr/bin/chfn \ && apt-get update && apt-get install -y \ + python-is-python3 \ python3-pip \ python3-dev \ xvfb \ @@ -26,8 +23,7 @@ RUN ln -s -f /bin/true /usr/bin/chfn \ && chown -R 1001:0 /home/lithium /run/user/lithium /var/run/pulse \ && chmod -R g=u /home/lithium /run/user/lithium /var/run/pulse -RUN ln -s /usr/bin/python3 /usr/local/bin/python \ - && pip3 install --upgrade pip +RUN pip3 install --upgrade pip COPY py_requirements.txt ./