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

fix(libstack): data loss for stack with relative path [FR-437] (#548)

develop
Oscar Zhou 2025-03-21 09:19:25 +13:00 committed by GitHub
parent a61c1004d3
commit 4b218553c3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/filesystem/copy.go
View File

@ -68,7 +68,7 @@ func copyFile(src, dst string) error {
defer from.Close() defer from.Close()
// has to include 'execute' bit, otherwise fails. MkdirAll follows `mkdir -m` restrictions // has to include 'execute' bit, otherwise fails. MkdirAll follows `mkdir -m` restrictions
if err := os.MkdirAll(filepath.Dir(dst), 0744); err != nil { if err := os.MkdirAll(filepath.Dir(dst), 0755); err != nil {
return err return err
} }
to, err := os.Create(dst) to, err := os.Create(dst)

5
pkg/libstack/compose/composeplugin.go
View File

@ -98,6 +98,11 @@ func withComposeService(
WorkingDir: filepath.Dir(filePaths[0]), WorkingDir: filepath.Dir(filePaths[0]),
} }
if options.ProjectDir != "" {
// When relative paths are used in the compose file, the project directory is used as the base path
configDetails.WorkingDir = options.ProjectDir
}
for _, p := range filePaths { for _, p := range filePaths {
configDetails.ConfigFiles = append(configDetails.ConfigFiles, types.ConfigFile{Filename: p}) configDetails.ConfigFiles = append(configDetails.ConfigFiles, types.ConfigFile{Filename: p})
} }