Merge pull request #131 from zhaotao1989/main

chore: fix docker build on windows
client: update form
This commit is contained in:
fantasticit 2022-07-19 13:52:26 +08:00 committed by GitHub
commit b565883e75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 7 deletions

6
.dockerignore Normal file
View File

@ -0,0 +1,6 @@
.idea
runtime
.git
**/.next/**
**/node_modules/**

View File

@ -4,7 +4,9 @@ WORKDIR /app
RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.ustc.edu.cn/g' /etc/apk/repositories 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 config set registry https://registry.npmmirror.com
RUN npm i -g pm2 @nestjs/cli pnpm 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 RUN bash build-output.sh
FROM node:18-alpine as prod FROM node:18-alpine as prod

View File

@ -51,16 +51,16 @@ export const Mail = () => {
/> />
<Form.Input <Form.Input
field="emailServicePassword" field="emailServiceUser"
label="邮件服务密码" label="邮件服务用户"
style={{ width: '100%' }} style={{ width: '100%' }}
placeholder="输入邮件服务密码" placeholder="输入邮件服务用户名"
rules={[{ required: true, message: '请输入邮件服务密码' }]} rules={[{ required: true, message: '请输入邮件服务用户名' }]}
/> />
<Form.Input <Form.Input
field="emailServiceUser" field="emailServicePassword"
label="邮件服务用户" label="邮件服务密码"
style={{ width: '100%' }} style={{ width: '100%' }}
placeholder="输入邮件服务密码" placeholder="输入邮件服务密码"
rules={[{ required: true, message: '请输入邮件服务密码' }]} rules={[{ required: true, message: '请输入邮件服务密码' }]}