From 226e8217d1ab8086fda8ceb01ad990c14e616a5a Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Tue, 5 Jan 2021 17:05:02 +0100 Subject: [PATCH 1/2] Upgrading to ubuntu:focal-20201106 --- Base/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Base/Dockerfile b/Base/Dockerfile index 5687853d63..0934ebd2c4 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -1,12 +1,12 @@ -FROM ubuntu:bionic-20191029 +FROM ubuntu:focal-20201106 LABEL authors="Selenium " #================================================ # Customize sources for apt-get #================================================ -RUN echo "deb http://archive.ubuntu.com/ubuntu bionic main universe\n" > /etc/apt/sources.list \ - && echo "deb http://archive.ubuntu.com/ubuntu bionic-updates main universe\n" >> /etc/apt/sources.list \ - && echo "deb http://security.ubuntu.com/ubuntu bionic-security main universe\n" >> /etc/apt/sources.list +RUN echo "deb http://archive.ubuntu.com/ubuntu focal main universe\n" > /etc/apt/sources.list \ + && echo "deb http://archive.ubuntu.com/ubuntu focal-updates main universe\n" >> /etc/apt/sources.list \ + && echo "deb http://security.ubuntu.com/ubuntu focal-security main universe\n" >> /etc/apt/sources.list # No interactive frontend during docker build ENV DEBIAN_FRONTEND=noninteractive \ From 5e2173524d4d71a25f013a157af9f137f2e25d8a Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Tue, 5 Jan 2021 17:29:28 +0100 Subject: [PATCH 2/2] Adding fix for Opera --- NodeOpera/Dockerfile.txt | 3 +++ NodeOpera/generate.sh | 3 +++ 2 files changed, 6 insertions(+) diff --git a/NodeOpera/Dockerfile.txt b/NodeOpera/Dockerfile.txt index cbd82ff36f..7927f3688a 100644 --- a/NodeOpera/Dockerfile.txt +++ b/NodeOpera/Dockerfile.txt @@ -13,6 +13,9 @@ USER root # latest (equivalent to opera-stable) # opera-beta (pull latest beta) #============================================ +# to avoid installing chromium-ffmpeg with snap (https://snapcraft.io/chromium-ffmpeg) +COPY --from=builder-codecs-ffmpeg /usr/lib/chromium-browser/libffmpeg.so /usr/lib/chromium-browser/libffmpeg.so + ARG OPERA_VERSION="opera-stable" RUN wget -q -O - https://deb.opera.com/archive.key | apt-key add - \ && echo "deb https://deb.opera.com/opera-stable/ stable non-free" >> /etc/apt/sources.list.d/opera-stable.list \ diff --git a/NodeOpera/generate.sh b/NodeOpera/generate.sh index 1d7fe1d7a3..9002e0e3c6 100755 --- a/NodeOpera/generate.sh +++ b/NodeOpera/generate.sh @@ -7,6 +7,9 @@ echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile echo "# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED." >> ./Dockerfile echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile +echo "FROM ubuntu:bionic AS builder-codecs-ffmpeg" >> ./Dockerfile +echo "RUN apt-get update -qqy && apt-get -qqy install chromium-codecs-ffmpeg-extra" >> ./Dockerfile +echo "" >> ./Dockerfile echo FROM ${NAMESPACE}/node-base:${VERSION} >> ./Dockerfile echo LABEL authors="$AUTHORS" >> ./Dockerfile echo "" >> ./Dockerfile