diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..65c31f59 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,6 @@ +.idea +runtime +.git + +**/.next/** +**/node_modules/** \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 6ad5a105..86046e97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,9 @@ WORKDIR /app RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories RUN npm config set registry https://registry.npmmirror.com RUN npm i -g pm2 @nestjs/cli pnpm -RUN apk --no-cache add bash +RUN apk --no-cache add bash dos2unix \ + && find . -name "*.sh" -exec dos2unix {} \; \ + && apk del dos2unix RUN bash build-output.sh FROM node:18-alpine as prod diff --git a/packages/client/src/components/admin/system-config/mail/index.tsx b/packages/client/src/components/admin/system-config/mail/index.tsx index fec4553e..83b84eca 100644 --- a/packages/client/src/components/admin/system-config/mail/index.tsx +++ b/packages/client/src/components/admin/system-config/mail/index.tsx @@ -51,16 +51,16 @@ export const Mail = () => { />