diff --git a/packages/content-fetch/Dockerfile b/packages/content-fetch/Dockerfile index fed7a6493..b05320b08 100644 --- a/packages/content-fetch/Dockerfile +++ b/packages/content-fetch/Dockerfile @@ -11,13 +11,6 @@ RUN apk add --no-cache \ nodejs \ yarn -# Tell Puppeteer to skip installing Chrome. We'll be using the installed package. -ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \ - PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser - -# Puppeteer v10.0.0 works with Chromium 92. -RUN yarn add puppeteer@10.0.0 - # Add user so we don't need --no-sandbox. RUN addgroup -S pptruser && adduser -S -g pptruser pptruser \ && mkdir -p /home/pptruser/Downloads /app \ @@ -27,7 +20,6 @@ RUN addgroup -S pptruser && adduser -S -g pptruser pptruser \ # Run everything after as non-privileged user. WORKDIR /app -ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true ENV CHROMIUM_PATH /usr/bin/chromium-browser ENV LAUNCH_HEADLESS=true diff --git a/packages/content-fetch/Dockerfile-local b/packages/content-fetch/Dockerfile-local index 4400363f3..383011f10 100644 --- a/packages/content-fetch/Dockerfile-local +++ b/packages/content-fetch/Dockerfile-local @@ -1,4 +1,3 @@ - FROM node:14.18-alpine # Installs latest Chromium (92) package. @@ -16,13 +15,6 @@ RUN apk add --no-cache \ make \ yarn -# Tell Puppeteer to skip installing Chrome. We'll be using the installed package. -ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \ - PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium-browser - -# Puppeteer v10.0.0 works with Chromium 92. -RUN yarn add puppeteer@10.0.0 - # Add user so we don't need --no-sandbox. RUN addgroup -S pptruser && adduser -S -g pptruser pptruser \ && mkdir -p /home/pptruser/Downloads /app \ @@ -32,7 +24,6 @@ RUN addgroup -S pptruser && adduser -S -g pptruser pptruser \ # Run everything after as non-privileged user. WORKDIR /app -ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD true ENV CHROMIUM_PATH /usr/bin/chromium-browser ENV LAUNCH_HEADLESS=true @@ -48,4 +39,4 @@ RUN yarn install --pure-lockfile EXPOSE 8080 -CMD ["yarn", "workspace", "@omnivore/content-fetch", "start"] \ No newline at end of file +CMD ["yarn", "workspace", "@omnivore/content-fetch", "start"] diff --git a/packages/content-fetch/fetch-content.js b/packages/content-fetch/fetch-content.js index a5718d6c5..f406a481c 100644 --- a/packages/content-fetch/fetch-content.js +++ b/packages/content-fetch/fetch-content.js @@ -101,7 +101,6 @@ const getBrowserPromise = (async () => { '--mute-audio', '--no-default-browser-check', '--no-pings', - '--no-sandbox', '--no-zygote', '--use-gl=swiftshader', '--window-size=1920,1080',