diff --git a/dev/build/Dockerfile b/dev/build/Dockerfile index 24d9c248..42956d65 100644 --- a/dev/build/Dockerfile +++ b/dev/build/Dockerfile @@ -1,9 +1,9 @@ # ==================== # --- Build Assets --- # ==================== -FROM node:18 AS assets +FROM node:20 AS assets -RUN apt-get update && apt-get install build-essential -y +RUN apt-get update && apt-get install -qy build-essential WORKDIR /wiki @@ -17,11 +17,18 @@ RUN cd ux && \ # =============== # --- Release --- # =============== -FROM node:18-alpine +FROM node:20 LABEL maintainer="requarks.io" -RUN apk add bash curl git openssh gnupg --no-cache && \ - mkdir -p /wiki && \ +RUN apt-get update && apt-get install -qy --no-install-recommends \ + bash \ + curl \ + git \ + gnupg \ + openssh-client \ + pandoc \ + && rm -rf /var/lib/apt/lists/* +RUN mkdir -p /wiki && \ mkdir -p /logs && \ mkdir -p /wiki/data/content && \ chown -R node:node /wiki /logs diff --git a/ux/quasar.config.js b/ux/quasar.config.js index 0dca74b2..9a964306 100644 --- a/ux/quasar.config.js +++ b/ux/quasar.config.js @@ -13,11 +13,11 @@ const path = require('path') const yaml = require('js-yaml') const fs = require('fs') -module.exports = configure(function (/* ctx */) { - const userConfig = { +module.exports = configure(function (ctx) { + const userConfig = ctx.dev ? { dev: { port: 3001, hmrClientPort: 3001 }, ...yaml.load(fs.readFileSync(path.resolve(__dirname, '../config.yml'), 'utf8')) - } + } : {} return { eslint: { @@ -123,7 +123,7 @@ module.exports = configure(function (/* ctx */) { devServer: { // https: true open: false, // opens browser window automatically - port: userConfig.dev.port, + port: userConfig.dev?.port, proxy: { '/_graphql': `http://127.0.0.1:${userConfig.port}/_graphql`, '/_site': `http://127.0.0.1:${userConfig.port}`, @@ -131,7 +131,7 @@ module.exports = configure(function (/* ctx */) { '/_user': `http://127.0.0.1:${userConfig.port}` }, hmr: { - clientPort: userConfig.dev.hmrClientPort + clientPort: userConfig.dev?.hmrClientPort }, vueDevtools: true },