2 Commits

Author SHA1 Message Date
6ec95e4bd9 ci: add bindfs install
Some checks failed
Create Release / changelog (push) Failing after 2m5s
2025-05-30 19:50:59 +03:00
578da7ff52 Revert "fix: use mount only for non-root users"
This reverts commit c51caf5c52.
2025-05-30 19:50:38 +03:00
2 changed files with 19 additions and 28 deletions

View File

@@ -49,7 +49,7 @@ jobs:
- name: Prepare for install - name: Prepare for install
run: | run: |
apt-get update && apt-get install -y libcap2-bin apt-get update && apt-get install -y libcap2-bin bindfs
- name: Build alr - name: Build alr
env: env:

View File

@@ -64,25 +64,20 @@ func BuildCmd() *cli.Command {
}, },
}, },
Action: func(c *cli.Context) error { Action: func(c *cli.Context) error {
var err error
var wd string
if utils.IsNotRoot() {
if err := utils.EnuseIsPrivilegedGroupMember(); err != nil { if err := utils.EnuseIsPrivilegedGroupMember(); err != nil {
return err return err
} }
wd, err = os.Getwd() wd, err := os.Getwd()
if err != nil { if err != nil {
return cliutils.FormatCliExit(gotext.Get("Error getting working directory"), err) return cliutils.FormatCliExit(gotext.Get("Error getting working directory"), err)
} }
var wdCleanup func() wd, wdCleanup, err := Mount(wd)
wd, wdCleanup, err = Mount(wd)
if err != nil { if err != nil {
return err return err
} }
defer wdCleanup() defer wdCleanup()
}
ctx := c.Context ctx := c.Context
@@ -172,16 +167,12 @@ func BuildCmd() *cli.Command {
if scriptArgs != nil { if scriptArgs != nil {
scriptFile := filepath.Base(scriptArgs.Script) scriptFile := filepath.Base(scriptArgs.Script)
scriptDir := filepath.Dir(scriptArgs.Script) newScriptDir, scriptDirCleanup, err := Mount(filepath.Dir(scriptArgs.Script))
if utils.IsNotRoot() {
var scriptDirCleanup func()
scriptDir, scriptDirCleanup, err = Mount(scriptDir)
if err != nil { if err != nil {
return err return err
} }
defer scriptDirCleanup() defer scriptDirCleanup()
} scriptArgs.Script = filepath.Join(newScriptDir, scriptFile)
scriptArgs.Script = filepath.Join(scriptDir, scriptFile)
} }
if err := utils.ExitIfCantDropCapsToAlrUser(); err != nil { if err := utils.ExitIfCantDropCapsToAlrUser(); err != nil {