paperclip-bot/labelimage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ci): fix

Browse Source
This commit is contained in:
zhangheng
2026-03-28 18:42:50 +08:00
parent 76bfb30fef
commit 6e5a40f821
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -4,7 +4,7 @@ stages:
sync_github: sync_github:
stage: sync_github stage: sync_github
tags: tags:
- webfront - webbuild
image: harbor.cowarobot.cn/softrepo/rust_build:1.94 image: harbor.cowarobot.cn/softrepo/rust_build:1.94
script: script:
- echo "代码已合并到 main, 开始执行发布逻辑..." - echo "代码已合并到 main, 开始执行发布逻辑..."
@@ -21,7 +21,7 @@ sync_github:
- echo ${CI_PROJECT_NAME} ${CI_PROJECT_PATH} ${CI_PROJECT_DIR} ${CI_PROJECT_URL} ${CI_COMMIT_SHA} - echo ${CI_PROJECT_NAME} ${CI_PROJECT_PATH} ${CI_PROJECT_DIR} ${CI_PROJECT_URL} ${CI_COMMIT_SHA}
- echo ${HARBORKEY} | docker login harbor.cowarobot.cn -u 'robot$softpro+cibuild' --password-stdin - echo ${HARBORKEY} | docker login harbor.cowarobot.cn -u 'robot$softpro+cibuild' --password-stdin
- rm -rf ${CI_PROJECT_NAME} - rm -rf ${CI_PROJECT_NAME}
- git clone https://oauth2:glpat-EdU8a_84jpSH2nOlNTkpnW86MQp1OjY1CA.01.0y1rtht99@git.cowarobot.com/${CI_PROJECT_PATH} - git clone https://oauth2:${TOKEN}@git.cowarobot.com/${CI_PROJECT_PATH}
- cd ${CI_PROJECT_NAME} - cd ${CI_PROJECT_NAME}
- bash build.sh prod - bash build.sh prod
rules: rules:

8
build.sh
View File

@@ -73,6 +73,10 @@ if [[ $? != 0 ]]; then echo -e "${RED}build error${NC}"; exit 100; fi
# Docker构建和推送 # Docker构建和推送
MAIN_NAME=web_digitalspace_labelimage MAIN_NAME=web_digitalspace_labelimage
DOCKER_FILE=$SHELL_FOLDER/Dockerfile DOCKER_FILE=$SHELL_FOLDER/Dockerfile
HARBOR_REPO=softrepo
if [[ $ENV == prod ]]; then
HARBOR_REPO=softpro
fi
if [[ $OUTPUT_TYPE == export ]]; then if [[ $OUTPUT_TYPE == export ]]; then
DOCKER_FILE=$SHELL_FOLDER/docker/nginx.dockerfile DOCKER_FILE=$SHELL_FOLDER/docker/nginx.dockerfile
@@ -87,7 +91,7 @@ docker build -f $DOCKER_FILE -t $MAIN_NAME $SHELL_FOLDER
if [[ $? != 0 ]]; then echo -e "${RED}build docker with error${NC}"; exit 100; fi if [[ $? != 0 ]]; then echo -e "${RED}build docker with error${NC}"; exit 100; fi
echo -e "${GREEN}Tagging and pushing docker image...${NC}" echo -e "${GREEN}Tagging and pushing docker image...${NC}"
docker tag $MAIN_NAME harbor.cowarobot.cn/softrepo/$MAIN_NAME:$FLAG_PROD docker tag $MAIN_NAME harbor.cowarobot.cn/$HARBOR_REPO/$MAIN_NAME:$FLAG_PROD
docker push harbor.cowarobot.cn/softrepo/$MAIN_NAME:$FLAG_PROD docker push harbor.cowarobot.cn/$HARBOR_REPO/$MAIN_NAME:$FLAG_PROD
echo -e "${GREEN}Build completed successfully${NC}" echo -e "${GREEN}Build completed successfully${NC}"