Browse Source

ci: fix build

NGPixel 1 year ago
parent
commit
2c8f9f8e30
4 changed files with 5 additions and 6 deletions
  1. 2 2
      .github/workflows/build.yml
  2. 3 1
      dev/build/Dockerfile
  3. 0 1
      ux/.npmrc
  4. 0 2
      ux/quasar.config.js

+ 2 - 2
.github/workflows/build.yml

@@ -46,13 +46,13 @@ jobs:
     - name: Build Assets
       working-directory: ux
       run: |
-        pnpm install
+        pnpm install --frozen-lockfile --shamefully-hoist
         pnpm build
 
     - name: Build Blocks
       working-directory: blocks
       run: |
-        pnpm install
+        pnpm install --frozen-lockfile
         pnpm build
 
     - name: Login to GitHub Container Registry

+ 3 - 1
dev/build/Dockerfile

@@ -14,6 +14,8 @@ RUN mkdir -p /wiki && \
     mkdir -p /logs && \
     mkdir -p /wiki/data/content && \
     chown -R node:node /wiki /logs
+RUN corepack enable && \
+    corepack prepare pnpm@latest --activate
 
 WORKDIR /wiki
 
@@ -28,7 +30,7 @@ USER node
 ENV NODE_ENV=production
 
 WORKDIR /wiki/server
-RUN npm ci --foreground-scripts --omit=dev --audit=false --fund=false
+RUN pnpm install --prod --frozen-lockfile
 
 WORKDIR /wiki
 

+ 0 - 1
ux/.npmrc

@@ -2,4 +2,3 @@ audit = false
 fund = false
 save-exact = true
 save-prefix = ""
-shamefully-hoist = true

+ 0 - 2
ux/quasar.config.js

@@ -90,8 +90,6 @@ module.exports = configure(function (ctx) {
       distDir: '../assets',
 
       extendViteConf (viteConf) {
-        viteConf.resolve.preserveSymlinks = true
-
         if (ctx.prod) {
           viteConf.build.assetsDir = '_assets'
           viteConf.build.rollupOptions = {