X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=Dockerfile;h=d1fb710c2a3588b399dfa336cb91caafe111a42c;hb=2355d116f49a4ae7578e6fb4ba044bb827aaf236;hp=eb381904b5b7ca0038025d04b5326a086f9ee356;hpb=98ecb0ea09c329f3c94ad072f8224fdd0d753bee;p=github%2Ffretlink%2Fdocker-puppeteer.git

diff --git a/Dockerfile b/Dockerfile
index eb38190..d1fb710 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,38 @@
-# A minimal Docker image with Node 8 and Puppeteer
+# A minimal Docker image with Node and Puppeteer
 #
 # Based upon:
 # https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md#running-puppeteer-in-docker
 
-FROM node:8-slim
+FROM node:10.15.2-slim@sha256:de903012172d2053faf91e10b25e3a16d1eb3048f46411d2c34f222f20dde7c0
     
 RUN  apt-get update \
      # See https://crbug.com/795759
      && apt-get install -yq libgconf-2-4 \
      # Install latest chrome dev package, which installs the necessary libs to
      # make the bundled version of Chromium that Puppeteer installs work.
-     && apt-get install -y wget --no-install-recommends \
+     && apt-get install -y wget make --no-install-recommends \
      && wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
      && sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
      && apt-get update \
      && apt-get install -y google-chrome-unstable --no-install-recommends \
      && rm -rf /var/lib/apt/lists/* \
-     # Finally, install Puppeteer under /node_modules so it's available system-wide
-     && npm i puppeteer@1.1.1 
\ No newline at end of file
+     && wget --quiet https://raw.githubusercontent.com/vishnubob/wait-for-it/master/wait-for-it.sh -O /usr/sbin/wait-for-it.sh \
+     && chmod +x /usr/sbin/wait-for-it.sh
+
+# Tell Puppeteer to skip installing Chrome. We'll be using the installed package.
+# you'll need to launch puppeteer with:
+#     browser.launch({executablePath: 'google-chrome-unstable'})
+ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true
+
+# Install Puppeteer under /node_modules so it's available system-wide
+ADD package.json package-lock.json /
+RUN npm install
+
+# Add user so we don't need --no-sandbox.
+RUN groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \
+    && mkdir -p /home/pptruser/Downloads \
+    && chown -R pptruser:pptruser /home/pptruser \
+    && chown -R pptruser:pptruser /node_modules
+
+# Run everything after as non-privileged user.
+USER pptruser