Skip to content

Commit bdb3030

Browse files
authored
Upgrading to ubuntu:focal-20201106 (#1172)
* Upgrading to ubuntu:focal-20201106 * Adding fix for Opera
1 parent 8f0707c commit bdb3030

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

Base/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM ubuntu:bionic-20191029
1+
FROM ubuntu:focal-20201106
22
LABEL authors="Selenium <[email protected]>"
33

44
#================================================
55
# Customize sources for apt-get
66
#================================================
7-
RUN echo "deb http://archive.ubuntu.com/ubuntu bionic main universe\n" > /etc/apt/sources.list \
8-
&& echo "deb http://archive.ubuntu.com/ubuntu bionic-updates main universe\n" >> /etc/apt/sources.list \
9-
&& echo "deb http://security.ubuntu.com/ubuntu bionic-security main universe\n" >> /etc/apt/sources.list
7+
RUN echo "deb http://archive.ubuntu.com/ubuntu focal main universe\n" > /etc/apt/sources.list \
8+
&& echo "deb http://archive.ubuntu.com/ubuntu focal-updates main universe\n" >> /etc/apt/sources.list \
9+
&& echo "deb http://security.ubuntu.com/ubuntu focal-security main universe\n" >> /etc/apt/sources.list
1010

1111
# No interactive frontend during docker build
1212
ENV DEBIAN_FRONTEND=noninteractive \

NodeOpera/Dockerfile.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ USER root
1313
# latest (equivalent to opera-stable)
1414
# opera-beta (pull latest beta)
1515
#============================================
16+
# to avoid installing chromium-ffmpeg with snap (https://snapcraft.io/chromium-ffmpeg)
17+
COPY --from=builder-codecs-ffmpeg /usr/lib/chromium-browser/libffmpeg.so /usr/lib/chromium-browser/libffmpeg.so
18+
1619
ARG OPERA_VERSION="opera-stable"
1720
RUN wget -q -O - https://deb.opera.com/archive.key | apt-key add - \
1821
&& echo "deb https://deb.opera.com/opera-stable/ stable non-free" >> /etc/apt/sources.list.d/opera-stable.list \

NodeOpera/generate.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" > ./Dockerfile
77
echo "# NOTE: DO *NOT* EDIT THIS FILE. IT IS GENERATED." >> ./Dockerfile
88
echo "# PLEASE UPDATE Dockerfile.txt INSTEAD OF THIS FILE" >> ./Dockerfile
99
echo "# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" >> ./Dockerfile
10+
echo "FROM ubuntu:bionic AS builder-codecs-ffmpeg" >> ./Dockerfile
11+
echo "RUN apt-get update -qqy && apt-get -qqy install chromium-codecs-ffmpeg-extra" >> ./Dockerfile
12+
echo "" >> ./Dockerfile
1013
echo FROM ${NAMESPACE}/node-base:${VERSION} >> ./Dockerfile
1114
echo LABEL authors="$AUTHORS" >> ./Dockerfile
1215
echo "" >> ./Dockerfile

0 commit comments

Comments
 (0)