X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/226e2d654af2ddb843d39d80a25c2501ff016de3..e9de1537f924c0ceb9c42086da5a54abba268126:/Dockerfile?ds=sidebyside diff --git a/Dockerfile b/Dockerfile index 0bd5947be..c85a64046 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:20.04 +FROM ubuntu:22.04 ENV DEBIAN_FRONTEND=noninteractive @@ -9,7 +9,7 @@ RUN apt-get update \ curl \ default-jre-headless \ file \ - firefox-geckodriver \ + gpg-agent \ libarchive-dev \ libffi-dev \ libgd-dev \ @@ -19,13 +19,20 @@ RUN apt-get update \ libxml2-dev \ libxslt1-dev \ locales \ - nodejs \ postgresql-client \ - ruby2.7 \ - ruby2.7-dev \ + ruby3.0 \ + ruby3.0-dev \ + software-properties-common \ tzdata \ unzip \ - yarnpkg \ + nodejs \ + npm \ + && npm install --global yarn \ + # We can't use snap packages for firefox inside a container, so we need to get firefox+geckodriver elsewhere + && add-apt-repository -y ppa:mozillateam/ppa \ + && echo "Package: *\nPin: release o=LP-PPA-mozillateam\nPin-Priority: 1001" > /etc/apt/preferences.d/mozilla-firefox \ + && apt-get install --no-install-recommends -y \ + firefox-geckodriver \ && apt-get clean \ && rm -rf /var/lib/apt/lists/*