yescent/yes.blog
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'release'

Browse Source 
Develop

See merge request yescent/yes.blog!4
This commit is contained in:
翔飞的风
2025-05-06 16:00:07 +00:00
parent b59a3c05b4 905a240121
commit a2836bc063
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@@ -21,10 +21,9 @@ build_develop:
script: script:
- Version=$(sed -n 's/.*<Version>\([^<]*\)<\/Version>.*/\1/p' ./${ProjectName}/${ProjectName}.csproj) - Version=$(sed -n 's/.*<Version>\([^<]*\)<\/Version>.*/\1/p' ./${ProjectName}/${ProjectName}.csproj)
- echo "${DockerImage}:v${Version}-develop${CI_PIPELINE_ID}" - echo "${DockerImage}:v${Version}-develop${CI_PIPELINE_ID}"
- echo "Registry = ${Ali_Docker_Registry}" - docker build -f ${DockerfilePath} -t ${ProductionDockerImage}:v${Version}-develop${CI_PIPELINE_ID} .
- docker build -f ${DockerfilePath} -t ${DockerImage}:v${Version}-develop${CI_PIPELINE_ID} . #- docker login -u ${Ali_Docker_UserName} -p ${Ali_Docker_Password} ${Ali_Docker_Registry}
- docker login -u ${Ali_Docker_UserName} -p ${Ali_Docker_Password} ${Ali_Docker_Registry} #- docker push ${DockerImage}:v${Version}-develop${CI_PIPELINE_ID}
- docker push ${DockerImage}:v${Version}-develop${CI_PIPELINE_ID}
only: only:
- develop - develop
@@ -78,7 +77,7 @@ deploy_develop:
script: script:
- ssh -t 192.168.31.123 "(docker stop ${PackageName} && docker rm ${PackageName} || echo 'Container ${PackageName} not found, skipping removal.') && docker login -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD} ${HARBOR_HOST} && docker run -e TZ=Asia/Shanghai -d --restart=always -v /data/yesblog:/app/files --name ${PackageName} -p ${AppPort}:8080 ${DockerImage}:v${Version}-develop${CI_PIPELINE_ID}" - ssh -t 192.168.31.123 "(docker stop ${PackageName} && docker rm ${PackageName} || echo 'Container ${PackageName} not found, skipping removal.') && docker login -u ${HARBOR_USERNAME} -p ${HARBOR_PASSWORD} ${HARBOR_HOST} && docker run -e TZ=Asia/Shanghai -d --restart=always -v /data/yesblog:/app/files --name ${PackageName} -p ${AppPort}:8080 ${DockerImage}:v${Version}-develop${CI_PIPELINE_ID}"
only: only:
- develop - develop1

2
Yes.Blog/Areas/Install/Pages/Index.cshtml
View File

@@ -143,7 +143,7 @@
this this
this.errorMessage = ""; this.errorMessage = "";
this.successMessage = ""; this.successMessage = "";
axios.post('/admin/api/install', this.data) axios.post('/install', this.data)
.then(res => { .then(res => {
console.log("res",res) console.log("res",res)
if(res.data.success){ if(res.data.success){