Merge pull request #230 from wikimedia/Arm-Fixes

Fix A11y arm image

Dockerfile.a11y-regression

@@ -16,8 +16,8 @@ RUN set -ex && \
     if [ "$ARCH" = "x86_64" ]; then \
        sudo npm install -g --unsafe-perm=true --allow-root pa11y@${PA11Y_VERSION}; \
     else \
-       sudo PUPPETEER_SKIP_DOWNLOAD=true PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true npm install -g --unsafe-perm=true --allow-root pa11y@${PA11Y_VERSION} && puppeteer-chromium-version-finder@^1.0.1 chromium-version-deb-finder@^2.0.1 && \
-       NODE_PATH="$(npm root -g):$(npm root -g)/backstopjs/node_modules" node -e " \
+       sudo PUPPETEER_SKIP_DOWNLOAD=true PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true npm install -g --unsafe-perm=true --allow-root pa11y@${PA11Y_VERSION} puppeteer@21.7.0 puppeteer-chromium-version-finder@^1.0.1 chromium-version-deb-finder@^2.0.1 && \
+       NODE_PATH="$(npm root -g):$(npm root -g)/puppeteer/node_modules" node -e " \
           const versionFinder = require('puppeteer-chromium-version-finder'); \
           const debFinder = require('chromium-version-deb-finder'); \
           (async () => { \
@@ -32,8 +32,6 @@ RUN set -ex && \
        sudo test -f /usr/bin/chromium && sudo ln -s /usr/bin/chromium /usr/bin/chromium-browser && sudo ln -s /usr/bin/chromium /usr/bin/chrome; \
     fi
 
-RUN sudo npm install -g mustache
-
 RUN wget https://dl-ssl.google.com/linux/linux_signing_key.pub && sudo apt-key add linux_signing_key.pub
 RUN sudo add-apt-repository "deb http://dl.google.com/linux/chrome/deb/ stable main"
 
@@ -52,7 +50,9 @@ RUN apt-get -qqy update \
   && rm -rf /var/lib/apt/lists/* \
   && apt-get -qyy clean
 
+RUN sudo npm install -g mustache
+
 ENV NODE_PATH=/usr/local/lib/node_modules
 
 #ENTRYPOINT ["tail", "-f", "/dev/null"]
-ENTRYPOINT ["node", "src/a11y/runA11yTests.js"]
+ENTRYPOINT ["node", "src/a11y/runA11yTests.js"]