提交 a4466985 作者: 龚洪江

Merge branch 'develop' of http://git.mmcuav.cn/iuav/csf-admin into develop

...@@ -2,8 +2,6 @@ FROM node:18-alpine as builder ...@@ -2,8 +2,6 @@ FROM node:18-alpine as builder
ARG PROFILES_ACTIVE ARG PROFILES_ACTIVE
ENV PROFILES_ACTIVE=$PROFILES_ACTIVE ENV PROFILES_ACTIVE=$PROFILES_ACTIVE
WORKDIR /app WORKDIR /app
# Install dependencies based on the preferred package manager
COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./ COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* ./
RUN \ RUN \
if [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i --frozen-lockfile; \ if [ -f pnpm-lock.yaml ]; then yarn global add pnpm && pnpm i --frozen-lockfile; \
...@@ -11,7 +9,6 @@ RUN \ ...@@ -11,7 +9,6 @@ RUN \
elif [ -f package-lock.json ]; then npm ci; \ elif [ -f package-lock.json ]; then npm ci; \
else echo "Lockfile not found." && exit 1; \ else echo "Lockfile not found." && exit 1; \
fi fi
COPY . . COPY . .
RUN \ RUN \
...@@ -19,8 +16,6 @@ RUN \ ...@@ -19,8 +16,6 @@ RUN \
else echo "env PROFILES_ACTIVE !=development. exec yarn run build" && yarn run build; \ else echo "env PROFILES_ACTIVE !=development. exec yarn run build" && yarn run build; \
fi fi
# RUN npm run build
# nginx # nginx
FROM nginx:alpine as production FROM nginx:alpine as production
VOLUME ["/var/log/nginx/"] VOLUME ["/var/log/nginx/"]
...@@ -32,4 +27,4 @@ COPY --from=builder /app/dist /usr/share/nginx/html ...@@ -32,4 +27,4 @@ COPY --from=builder /app/dist /usr/share/nginx/html
COPY nginx.conf /etc/nginx/nginx.conf COPY nginx.conf /etc/nginx/nginx.conf
EXPOSE 80 EXPOSE 80
# Containers run nginx with global directives and daemon off # Containers run nginx with global directives and daemon off
ENTRYPOINT ["nginx", "-g", "daemon off;"] ENTRYPOINT ["nginx", "-g", "daemon off;"]
\ No newline at end of file
...@@ -14,4 +14,4 @@ patches: ...@@ -14,4 +14,4 @@ patches:
images: images:
- name: REGISTRY/NAMESPACE/IMAGE:TAG - name: REGISTRY/NAMESPACE/IMAGE:TAG
newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
newTag: 5868237b60e1d3a5da2c659ac26d445dbfb21cd3 newTag: 276dfc6cfa696e07eae1f42082c946103fec0d7c
...@@ -142,7 +142,8 @@ const CustomIdentityView = () => { ...@@ -142,7 +142,8 @@ const CustomIdentityView = () => {
title: '服务评价', title: '服务评价',
dataIndex: 'score', dataIndex: 'score',
align: 'center', align: 'center',
render: (text) => text && <Rate disabled defaultValue={Number(text)} />, width: '120px',
render: (text) => text && <Rate disabled value={Number(text)} />,
}, },
{ {
title: '申请时间', title: '申请时间',
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论