diff --git a/deploy/Dockerfile b/deploy/Dockerfile index ae78992..194cdb4 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -1,19 +1,16 @@ -FROM registry.datameta.com:8180/public/node:17.9.1-alpine3.15 as builder +FROM registry.datameta.com:8180/public/builder-nodejs:v3.2.0-podman-16.14.2 as builder WORKDIR /root COPY . /root -# RUN npm -ENV NODE_OPTIONS '--openssl-legacy-provider --max-old-space-size=8000' -RUN set -x \ - && sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories \ - && apk --no-cache add python2 make g++ && npm config set strict-peer-dependencies=false && \ - npm install --ignore-optional --registry=http://172.16.32.57:8931/repository/npm-group/ --verbose --legacy-peer-deps && \ - npm run build - -# RUN yarn config set strict-peer-dependencies false && \ -# yarn config set registry http://172.16.32.57:8931/repository/npm-group/ && \ -# yarn && \ -# yarn run build:pro +RUN yum install -y centos-release-scl && \ +yum install -y devtoolset-8-gcc devtoolset-8-gcc-c++ && \ +source /opt/rh/devtoolset-8/enable && \ +yarn config set strict-peer-dependencies false && \ +yarn config set sass_binary_site http://cdn.npm.taobao.org/dist/node-sass && \ +yarn config set registry http://172.16.32.57:8931/repository/npm-group/ && \ +npm install core-js@3 --save && \ +yarn && \ +yarn run build # Second stage: minimal runtime environment FROM registry.datameta.com:8180/public/nginx:1.25-alpine diff --git a/package.json b/package.json index 97bd238..477e369 100644 --- a/package.json +++ b/package.json @@ -60,11 +60,11 @@ "less": "^4.1.1", "less-loader": "^7.0.0", "node-jsencrypt": "^1.0.0", - "node-sass": "^4.12.0", + "node-sass": "^6.0.1", "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", - "pdfjs-dist": "^3.1.81", + "pdfjs-dist": "^2.16.105", "quill": "^2.0.0-dev.3", "quill-better-table": "^1.2.10", "screenfull": "4.2.0", @@ -112,7 +112,7 @@ "mockjs": "1.0.1-beta3", "plop": "2.3.0", "runjs": "4.3.2", - "sass-loader": "^8.0.2", + "sass-loader": "^10.2.0", "script-ext-html-webpack-plugin": "^2.1.5", "script-loader": "0.7.2", "serve-static": "1.13.2",