From c080a3b0e1eed2184b4b7bb77a6abd8c2c39b9f4 Mon Sep 17 00:00:00 2001 From: Lucas Manuel Rodriguez Date: Mon, 18 Nov 2024 11:32:55 -0300 Subject: [PATCH] Check `opt.NativeTooling` before creating `build` directory (#23894) #23893 Changes on top of the PR from the @ilpianista: https://github.com/fleetdm/fleet/pull/23796 --- changes/23893-fix-docker-fleetctl | 1 + orbit/pkg/packaging/linux_shared.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 changes/23893-fix-docker-fleetctl diff --git a/changes/23893-fix-docker-fleetctl b/changes/23893-fix-docker-fleetctl new file mode 100644 index 0000000000..3d68bd2540 --- /dev/null +++ b/changes/23893-fix-docker-fleetctl @@ -0,0 +1 @@ +* Fixed bug in `fleetdm/fleetctl` docker image where the `build` directory does not exist when generating deb/rpm packages. diff --git a/orbit/pkg/packaging/linux_shared.go b/orbit/pkg/packaging/linux_shared.go index 159bb03d57..0aaab13b16 100644 --- a/orbit/pkg/packaging/linux_shared.go +++ b/orbit/pkg/packaging/linux_shared.go @@ -250,8 +250,8 @@ func buildNFPM(opt Options, pkger nfpm.Packager) (string, error) { return "", fmt.Errorf("removing existing file: %w", err) } - if _, err := os.Stat("build"); errors.Is(err, os.ErrNotExist) { - if err := secure.MkdirAll("build", 0700); err != nil { + if opt.NativeTooling { + if err := secure.MkdirAll(filepath.Dir(filename), 0o700); err != nil { return "", fmt.Errorf("cannot create build dir: %w", err) } }