Skip to content

Commit d8e025d

Browse files
author
chufan
committed
fix: 修复dockerfile构建异常
1 parent d7a3ae7 commit d8e025d

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ ARG CONTAINER_BUILD
1414
WORKDIR /apps
1515
COPY . .
1616

17-
RUN echo $CONTAINER_BUILD
17+
# RUN echo $CONTAINER_BUILD
1818

1919
## 基于容器自动构建
2020
RUN if [ "$CONTAINER_BUILD" = "true" ]; then \
21-
npm i pnpm@7 -g && pnpm i -D && pnpm build; \
21+
./scripts/ci && pnpm build; \
2222
fi;
2323

2424
FROM registry.cn-hangzhou.aliyuncs.com/142vip/nginx:1.23.0-alpine

scripts/release

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ readonly commitInfo='chore(release): publish v%s'
1616
current_branch=$(git rev-parse --abbrev-ref HEAD)
1717

1818
# 判断分支名称
19-
if [ "$current_branch" = "next1" ]; then
20-
19+
if [ "$current_branch" = "next" ]; then
2120
bumpp --preid alpha --execute="$generateChangeLog" --commit "$commitInfo" --all --tag --push
22-
2321
else
2422
echo "当前分支是:$current_branch ,版本迭代允许在next分之操作,并推送到远程!!!"
2523
fi

0 commit comments

Comments
 (0)