From f5f90dd765707058ede98782fcf8021404ceb406 Mon Sep 17 00:00:00 2001 From: Diego Molina Date: Fri, 10 Nov 2023 11:06:09 +0100 Subject: [PATCH] Switching to Jammy (#1923) * Switching to Jammy * Update for Firefox node on ubuntu jammy (#2001) Signed-off-by: Viet Nguyen Duc --------- Signed-off-by: Viet Nguyen Duc Co-authored-by: Viet Nguyen Duc [deploy] --- Base/Dockerfile | 8 ++++---- NodeBase/Dockerfile | 4 ++-- NodeFirefox/Dockerfile | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Base/Dockerfile b/Base/Dockerfile index a0d034594..14e0feb8a 100644 --- a/Base/Dockerfile +++ b/Base/Dockerfile @@ -1,12 +1,12 @@ -FROM ubuntu:focal-20231003 +FROM ubuntu:jammy-20231004 LABEL authors="Selenium " #================================================ # Customize sources for apt-get #================================================ -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 +RUN echo "deb http://archive.ubuntu.com/ubuntu jammy main universe\n" > /etc/apt/sources.list \ + && echo "deb http://archive.ubuntu.com/ubuntu jammy-updates main universe\n" >> /etc/apt/sources.list \ + && echo "deb http://security.ubuntu.com/ubuntu jammy-security main universe\n" >> /etc/apt/sources.list # No interactive frontend during docker build ENV DEBIAN_FRONTEND=noninteractive \ diff --git a/NodeBase/Dockerfile b/NodeBase/Dockerfile index 1d241d3b4..2e9f519d4 100644 --- a/NodeBase/Dockerfile +++ b/NodeBase/Dockerfile @@ -64,7 +64,7 @@ RUN apt-get update -qqy \ # fonts-ipafont-gothic ~13 MB # fonts-wqy-zenhei ~17 MB # fonts-tlwg-loma-otf ~300 KB -# ttf-ubuntu-font-family ~5 MB +# fonts-ubuntu ~5 MB # Ubuntu Font Family, sans-serif typeface hinted for clarity # Removed packages: # xfonts-100dpi ~6 MB @@ -84,7 +84,7 @@ RUN apt-get -qqy update \ fonts-ipafont-gothic \ fonts-wqy-zenhei \ fonts-tlwg-loma-otf \ - ttf-ubuntu-font-family \ + fonts-ubuntu \ fonts-noto-color-emoji \ && rm -rf /var/lib/apt/lists/* \ && apt-get -qyy clean diff --git a/NodeFirefox/Dockerfile b/NodeFirefox/Dockerfile index 0590f1678..698fe6338 100644 --- a/NodeFirefox/Dockerfile +++ b/NodeFirefox/Dockerfile @@ -13,6 +13,7 @@ ARG FIREFOX_VERSION=latest RUN FIREFOX_DOWNLOAD_URL=$(if [ $FIREFOX_VERSION = "latest" ] || [ $FIREFOX_VERSION = "beta-latest" ] || [ $FIREFOX_VERSION = "nightly-latest" ] || [ $FIREFOX_VERSION = "devedition-latest" ] || [ $FIREFOX_VERSION = "esr-latest" ]; then echo "https://download.mozilla.org/?product=firefox-$FIREFOX_VERSION-ssl&os=linux64&lang=en-US"; else echo "https://download-installer.cdn.mozilla.net/pub/firefox/releases/$FIREFOX_VERSION/linux-x86_64/en-US/firefox-$FIREFOX_VERSION.tar.bz2"; fi) \ && apt-get update -qqy \ && apt-get -qqy --no-install-recommends install firefox libavcodec-extra \ + libgtk-3-dev libdbus-glib-1-dev \ && rm -rf /var/lib/apt/lists/* /var/cache/apt/* \ && wget --no-verbose -O /tmp/firefox.tar.bz2 $FIREFOX_DOWNLOAD_URL \ && apt-get -y purge firefox \