Merge remote-tracking branch 'upstream/pull/4223'

[rails.git] / Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 02d9ff170e19a05216fa1bd1c03ee61aa8b707b6..f3c56e1615c922c53a91dd5aaae86ea9a51c0d64 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -26,11 +26,10 @@ RUN apt-get update \
       software-properties-common \
       tzdata \
       unzip \
- && curl https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - \
- && add-apt-repository -y -U https://deb.nodesource.com/node_18.x \
- && apt-get install --no-install-recommends -y \
       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 \