Skip to content

Commit 81f79be

Browse files
committed
Check opt.NativeTooling before creating build directory
1 parent b488b0e commit 81f79be

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

changes/23893-fix-docker-fleetctl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* Fixed bug in `fleetdm/fleetctl` docker image where the `build` directory does not exist when generating deb/rpm packages.

orbit/pkg/packaging/linux_shared.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,8 +250,8 @@ func buildNFPM(opt Options, pkger nfpm.Packager) (string, error) {
250250
return "", fmt.Errorf("removing existing file: %w", err)
251251
}
252252

253-
if _, err := os.Stat("build"); errors.Is(err, os.ErrNotExist) {
254-
if err := secure.MkdirAll("build", 0700); err != nil {
253+
if opt.NativeTooling {
254+
if err := secure.MkdirAll(filepath.Dir(filename), 0o700); err != nil {
255255
return "", fmt.Errorf("cannot create build dir: %w", err)
256256
}
257257
}

0 commit comments

Comments
 (0)