From 9c3cd2c9b8edc3e40b65d376d85f33bb15ac5980 Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Sun, 1 May 2022 17:44:45 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8Ddockerfile=E7=9A=84?= =?UTF-8?q?=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 10 +++++----- docker-compose.yml | 2 ++ pnpm-lock.yaml | 9 ++++++++- web/plugins/com.msgbyte.bbcode/package.json | 1 + 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index b3711d91..4560dedb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,11 +5,11 @@ WORKDIR /app # Install dependencies COPY . . -RUN npm install -g pnpm +RUN npm install -g pnpm@6.24.2 RUN pnpm install -RUN cd web -RUN pnpm build - EXPOSE 11011 -CMD npx http-server -p 11011 ./dist + +RUN cd web && pnpm build + +CMD npx http-server -p 11011 ./web/dist diff --git a/docker-compose.yml b/docker-compose.yml index 295d62e6..15c2f5d8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,3 +7,5 @@ services: image: tailchat-web environment: SERVICE_URL: ${SERVICE_URL} + ports: + - 11011:11011 diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 5db1b7f7..add058d6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -403,12 +403,14 @@ importers: specifiers: '@bbob/parser': ^2.7.0 '@types/react-highlight': ^0.12.5 + highlight.js: ^11.5.1 react: 17.0.2 react-dom: 17.0.2 react-highlight: ^0.14.0 url-regex: ^5.0.0 dependencies: '@bbob/parser': 2.8.0 + highlight.js: 11.5.1 react-highlight: 0.14.0_react-dom@17.0.2+react@17.0.2 url-regex: 5.0.0 devDependencies: @@ -10932,7 +10934,12 @@ packages: dev: true /highlight.js/10.7.3: - resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/highlight.js/download/highlight.js-10.7.3.tgz} + resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==} + + /highlight.js/11.5.1: + resolution: {integrity: sha512-LKzHqnxr4CrD2YsNoIf/o5nJ09j4yi/GcH5BnYz9UnVpZdS4ucMgvP61TDty5xJcFGRjnH4DpujkS9bHT3hq0Q==} + engines: {node: '>=12.0.0'} + dev: false /history/4.10.1: resolution: {integrity: sha1-MzcaZeOoOyZ0NOKz87G0xYqtTPM=, registry: https://registry.npm.taobao.org/, tarball: https://registry.npm.taobao.org/history/download/history-4.10.1.tgz} diff --git a/web/plugins/com.msgbyte.bbcode/package.json b/web/plugins/com.msgbyte.bbcode/package.json index 7d00a764..7acbb658 100644 --- a/web/plugins/com.msgbyte.bbcode/package.json +++ b/web/plugins/com.msgbyte.bbcode/package.json @@ -5,6 +5,7 @@ "private": true, "dependencies": { "@bbob/parser": "^2.7.0", + "highlight.js": "^11.5.1", "react-highlight": "^0.14.0", "url-regex": "^5.0.0" },