Update to Ubuntu 20.04 (#1169)

* Update to Ubuntu 20.04

* Fix libffmpeg error on ubuntu 20.04 (opera)

Co-authored-by: Diego Molina <[email protected]>

Author: hbouhadji

.github/workflows/build-test.yml

@@ -13,7 +13,7 @@ jobs:
     # Skip job based on the commit message, only works in push to branches for now
     if: contains(toJson(github.event.commits), '[skip ci]') == false
     name: Build & test Docker images with random user
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         use-random-user: [false, true]

.github/workflows/deploy.yml

@@ -10,7 +10,7 @@ jobs:
     # Only continue if the commit message has '[deploy]' in it
     if: contains(toJson(github.event.commits), '[deploy]') == true
     name: Deploy Docker images
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout code
         uses: actions/checkout@v2

.github/workflows/test-video.yml

@@ -13,7 +13,7 @@ jobs:
     # Skip job based on the commit message, only works in push to branches for now
     if: contains(toJson(github.event.commits), '[skip ci]') == false
     name: Test video recorded through Docker Selenium
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
         use-random-user: [false, true]

Base/Dockerfile

@@ -1,12 +1,12 @@
-FROM ubuntu:bionic-20201119
+FROM ubuntu:focal-20201106
 LABEL authors="Selenium <[email protected]>"
 
 #================================================
 # 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 \

Makefile

@@ -382,9 +382,9 @@ test_video: video hub chrome firefox opera
 	done
 	# Using ffmpeg to verify file integrity
 	# https://superuser.com/questions/100288/how-can-i-check-the-integrity-of-a-video-file-avi-mpeg-mp4
-	docker run -v $$(pwd):$$(pwd) -w $$(pwd) jrottenberg/ffmpeg:4.3.1-ubuntu1804 -v error -i ./tests/videos/chrome_video.mp4 -f null - 2>error.log
-	docker run -v $$(pwd):$$(pwd) -w $$(pwd) jrottenberg/ffmpeg:4.3.1-ubuntu1804 -v error -i ./tests/videos/firefox_video.mp4 -f null - 2>error.log
-	docker run -v $$(pwd):$$(pwd) -w $$(pwd) jrottenberg/ffmpeg:4.3.1-ubuntu1804 -v error -i ./tests/videos/opera_video.mp4 -f null - 2>error.log
+	docker run -v $$(pwd):$$(pwd) -w $$(pwd) jrottenberg/ffmpeg:4.3.1-ubuntu2004 -v error -i ./tests/videos/chrome_video.mp4 -f null - 2>error.log
+	docker run -v $$(pwd):$$(pwd) -w $$(pwd) jrottenberg/ffmpeg:4.3.1-ubuntu2004 -v error -i ./tests/videos/firefox_video.mp4 -f null - 2>error.log
+	docker run -v $$(pwd):$$(pwd) -w $$(pwd) jrottenberg/ffmpeg:4.3.1-ubuntu2004 -v error -i ./tests/videos/opera_video.mp4 -f null - 2>error.log
 
 .PHONY: \
 	all \

NodeBase/start-xvfb.sh

@@ -6,9 +6,9 @@ if [ "${START_XVFB}" = true ] ; then
   rm -f /tmp/.X*lock
 
   # Command reference
-  # http://manpages.ubuntu.com/manpages/bionic/man1/xvfb-run.1.html
-  # http://manpages.ubuntu.com/manpages/bionic/man1/Xvfb.1.html
-  # http://manpages.ubuntu.com/manpages/bionic/man1/Xserver.1.html
+  # http://manpages.ubuntu.com/manpages/focal/man1/xvfb-run.1.html
+  # http://manpages.ubuntu.com/manpages/focal/man1/Xvfb.1.html
+  # http://manpages.ubuntu.com/manpages/focal/man1/Xserver.1.html
   /usr/bin/xvfb-run --server-num=${DISPLAY_NUM} \
     --listen-tcp \
     --server-args="-screen 0 ${GEOMETRY} -fbdir /var/tmp -dpi ${SCREEN_DPI} -listen tcp -noreset -ac +extension RANDR" \

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 \

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

Video/Dockerfile

@@ -1,12 +1,12 @@
-FROM jrottenberg/ffmpeg:4.3.1-ubuntu1804
+FROM jrottenberg/ffmpeg:4.3.1-ubuntu2004
 LABEL authors="Selenium <[email protected]>"
 
 #================================================
 # 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 \