github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(stack/git): clone to non-version project path during auto update

fix/EE-5980/version-stack-backward-capability
oscarzhou 2023-08-17 13:12:42 +12:00
parent 748c6fa22a
commit 2bfb4c0e25
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
api/git/update/update.go
View File

@ -48,10 +48,6 @@ func UpdateGitObject(gitService portainer.GitService, objId string, gitConfig *g
} }
toDir := projectPath toDir := projectPath
if enableVersionFolder {
toDir = filesystem.JoinPaths(projectPath, newHash)
}
cloneParams := &cloneRepositoryParameters{ cloneParams := &cloneRepositoryParameters{
url: gitConfig.URL, url: gitConfig.URL,
ref: gitConfig.ReferenceName, ref: gitConfig.ReferenceName,
@ -65,10 +61,20 @@ func UpdateGitObject(gitService portainer.GitService, objId string, gitConfig *g
} }
} }
// For backward compatibility, we need to clone the repository in the old project path
if err := cloneGitRepository(gitService, cloneParams); err != nil { if err := cloneGitRepository(gitService, cloneParams); err != nil {
return false, "", errors.WithMessagef(err, "failed to do a fresh clone of %v", objId) return false, "", errors.WithMessagef(err, "failed to do a fresh clone of %v", objId)
} }
if enableVersionFolder {
toDir = filesystem.JoinPaths(projectPath, newHash)
cloneParams.toDir = toDir
if err := cloneGitRepository(gitService, cloneParams); err != nil {
return false, "", errors.WithMessagef(err, "failed to do a fresh clone of %v", objId)
}
}
log.Debug(). log.Debug().
Str("hash", newHash). Str("hash", newHash).
Str("url", gitConfig.URL). Str("url", gitConfig.URL).