pkg/chrootarchive: fix Darwin build

Before this commit, `doPack`, `doUnpack` and `doUnpackLayer` were not implemented for Darwin, causing build failure. This change allows all non-Linux Unixes to use FreeBSD reexec-based pack/unpack implementation See also: moby/buildkit#4059 See also: 8b84373 Signed-off-by: Marat Radchenko <[email protected]>
slonopotamus · Sep 10, 2023 · 3c4859c · 3c4859c
1 parent 6ce5aa1
commit 3c4859c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/chrootarchive/archive_freebsd.go → pkg/chrootarchive/archive_unix_nonlinux.go b/pkg/chrootarchive/archive_freebsd.go → pkg/chrootarchive/archive_unix_nonlinux.go
@@ -1,3 +1,5 @@
+//go:build !linux && !windows
+
 package chrootarchive // import "github.com/docker/docker/pkg/chrootarchive"
 
 import (
@@ -15,9 +17,9 @@ import (
 )
 
 const (
-	packCmd        = "freebsd-pack-in-chroot"
-	unpackCmd      = "freebsd-unpack-in-chroot"
-	unpackLayerCmd = "freebsd-unpack-layer-in-chroot"
+	packCmd        = "chrootarchive-pack-in-chroot"
+	unpackCmd      = "chrootarchive-unpack-in-chroot"
+	unpackLayerCmd = "chrootarchive-unpack-layer-in-chroot"
 )
 
 func init() {

diff --git a/pkg/chrootarchive/archive_freebsd_test.go → ...rootarchive/archive_unix_nonlinux_test.go b/pkg/chrootarchive/archive_freebsd_test.go → ...rootarchive/archive_unix_nonlinux_test.go
@@ -1,3 +1,5 @@
+//go:build !linux && !windows
+
 package chrootarchive // import "github.com/docker/docker/pkg/chrootarchive"
 
 import (