From 0376d7885083a13643801d038d4503875cc2cfaf Mon Sep 17 00:00:00 2001 From: NGPixel Date: Sun, 2 Aug 2026 23:58:33 -0400 Subject: [PATCH] ci: fix release dockerfile build --- dev/build/Dockerfile | 11 ++++------- dev/build/config.yml | 10 ++++------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/dev/build/Dockerfile b/dev/build/Dockerfile index a0362ad62..adf485be9 100644 --- a/dev/build/Dockerfile +++ b/dev/build/Dockerfile @@ -21,7 +21,7 @@ WORKDIR /wiki COPY --chown=node:node ./assets ./assets COPY --chown=node:node ./blocks/compiled ./blocks/compiled -COPY --chown=node:node ./server ./server +COPY --chown=node:node ./backend ./backend COPY --chown=node:node ./dev/build/config.yml ./config.yml COPY --chown=node:node ./LICENSE ./LICENSE @@ -35,18 +35,15 @@ ENV NODE_ENV=production ENV PUPPETEER_SKIP_DOWNLOAD=true ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium -WORKDIR /wiki/server -RUN pnpm install --prod --frozen-lockfile +WORKDIR /wiki/backend +RUN npm ci --omit=dev # The Puppeteer extension, which server-side page rendering needs. Added here rather than declared in # `backend/package.json` because it is an optional extension: an installation that renders its pages in # the editor -- which is all of them, on any normal save -- has no use for a browser on the server, and # a source checkout should not have to fetch one to install the backend. Pinned like every other # dependency, so an image build is reproducible. -RUN pnpm add puppeteer@25.4.0 - -# Set extensions as installed -RUN touch node_modules/sharp/wiki_installed.txt +RUN npm install --no-save puppeteer@25.4.0 WORKDIR /wiki diff --git a/dev/build/config.yml b/dev/build/config.yml index e73dba5af..fcd15bca8 100644 --- a/dev/build/config.yml +++ b/dev/build/config.yml @@ -6,12 +6,10 @@ db: user: '$(DB_USER)' pass: '$(DB_PASS)' db: $(DB_NAME) + schema: $(DB_SCHEMA:wiki) ssl: $(DB_SSL) -ssl: - enabled: $(SSL_ACTIVE) - port: 3443 - provider: letsencrypt - domain: $(LETSENCRYPT_DOMAIN) - subscriberEmail: $(LETSENCRYPT_EMAIL) logLevel: $(LOG_LEVEL:info) logFormat: $(LOG_FORMAT:default) +dataPath: ./data +scheduler: + workers: auto