From db6211777bf6aeb720cea90eb3d130a38ad7a03a Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Fri, 16 May 2025 14:04:55 +0200 Subject: [PATCH] improve test and docker runner --- .github/workflows/test.yml | 7 ++----- Dockerfile | 31 +++++++++++++++---------------- 2 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index a3fef6b..5b291b8 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -19,11 +19,8 @@ jobs: node-version: 22 cache: 'pnpm' - - name: Enable pnpm via Corepack - run: corepack enable - - - name: Set pnpm version - run: corepack prepare pnpm@latest --activate + - name: Install pnpm + run: npm install -g pnpm - name: Install dependencies run: pnpm install diff --git a/Dockerfile b/Dockerfile index 98249da..dbed8ae 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,26 +2,25 @@ FROM node:22 WORKDIR /fredy -COPY . /fredy +COPY . . -RUN apt-get update && apt-get install -y chromium +RUN apt-get update && \ + apt-get install -y chromium && \ + apt-get clean && rm -rf /var/lib/apt/lists/* ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \ - PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium + PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium -RUN corepack enable && pnpm config set network-timeout 600000 - -RUN pnpm install - -RUN pnpm add -g pm2 - -RUN pnpm run prod - -RUN mkdir /db /conf && \ - chown 1000:1000 /db /conf && \ - chmod 777 -R /db/ && \ - ln -s /db /fredy/db && ln -s /conf /fredy/conf +RUN npm install -g pnpm && \ + pnpm config set network-timeout 600000 && \ + pnpm install && \ + pnpm add -g pm2 && \ + pnpm run prod && \ + mkdir /db /conf && \ + chown 1000:1000 /db /conf && \ + chmod 777 -R /db/ && \ + ln -s /db /fredy/db && ln -s /conf /fredy/conf EXPOSE 9998 -CMD pm2-runtime index.js \ No newline at end of file +CMD ["pm2-runtime", "index.js"]