Merge pull request moby#46094 from slonopotamus/darwin-build-fix

pkg/chrootarchive: fix Darwin build
runpod · Oct 12, 2023 · 796c05c · 796c05c
2 parents 3e43f8e + 9e3ed7b
commit 796c05c
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_nolinux.go b/pkg/chrootarchive/archive_freebsd.go → pkg/chrootarchive/archive_unix_nolinux.go
@@ -1,3 +1,5 @@
+//go:build unix && !linux
+
 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 → ...hrootarchive/archive_unix_nolinux_test.go b/pkg/chrootarchive/archive_freebsd_test.go → ...hrootarchive/archive_unix_nolinux_test.go
@@ -1,3 +1,5 @@
+//go:build unix && !linux
+
 package chrootarchive // import "github.com/docker/docker/pkg/chrootarchive"
 
 import (