Merge pull request #41 from matrixgpt/fix-docker

Remove unused support for sandboxing

.nvmrc

@@ -1 +1 @@
-v18.12.1
+v18.13.0

Dockerfile

@@ -1,26 +1,8 @@
-FROM satantime/puppeteer-node:18.12.1 as builder
+FROM satantime/puppeteer-node:19-slim
 
 # Create app directory
 WORKDIR /usr/src/app
-
-# Install app dependencies
-COPY package*.json ./
-
-# We don't need the standalone Chromium here.
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
-
-RUN yarn install --frozen-lockfile && yarn cache clean
-
-COPY . .
-
-RUN yarn build
-
-
-FROM satantime/puppeteer-node:18.12.1-slim
-
-RUN mkdir -p /home/pptruser/Downloads
-# Create app directory
-WORKDIR /home/pptruser
+RUN mkdir -p /usr/src/app/Downloads
 
 ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
 ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
@@ -30,37 +12,23 @@ ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update -qq \
     && apt install -qq -y --no-install-recommends \
       chromium \
-      chromium-sandbox \
       dumb-init \
+      # To run Headful mode we just need to install Xvfb and Puppeteer related dependencies.
+      xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic \
+      xvfb xauth\
     && rm -rf /var/lib/apt/lists/* \
     && rm -rf /src/*.deb
 
-# To run Headful mode, you will need to have a display, which is not present in a server.
-# To avoid this, we will use Xvfb, and create a fake display, so the chrome will think there is a display and run properly.
-# So we just need to install Xvfb and Puppeteer related dependencies.
-RUN apt-get update && apt-get install -yq \ 
-    x11vnc x11-xkb-utils xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic x11-apps xvfb
-
 # Install app dependencies
 COPY package*.json ./
-
 RUN yarn install --frozen-lockfile --production && yarn cache clean
 
-COPY --from=builder /usr/src/app/dist ./dist
+COPY ./tsconfig.json ./tsconfig.json
+COPY ./src ./src
+RUN yarn build
 
-RUN npm install puppeteer@19.4.1 \
-    # Add user so we don't need --no-sandbox.
-    # same layer as npm install to keep re-chowned files from using up several hundred MBs more space
-    && groupadd -r pptruser && useradd -rm -g pptruser -G audio,video pptruser \
-    && chown -R pptruser:pptruser /home/pptruser
-
-RUN mkdir /storage && \
-    chown -R pptruser:pptruser /storage
-USER pptruser
 VOLUME /storage
-
 ENV DATA_PATH="/storage"
 
-# We run a fake display and run our script.
-# Start script on Xvfb
+# We run a fake display and run our script using Xvfb
 CMD xvfb-run --server-args="-screen 0 1024x768x24" yarn start

package.json

@@ -7,7 +7,7 @@
   "license": "AGPL-3.0",
   "type": "module",
   "engines": {
-    "node": "v18.12.1"
+    "node": ">=18.12.1"
   },
   "scripts": {
     "build": "rm -f tsconfig.tsbuildinfo && npx tsc",