Ver código fonte

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

pkg/chrootarchive: fix Darwin build
Bjorn Neergaard 1 ano atrás
pai
commit
796c05ca32

+ 5 - 3
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() {

+ 2 - 0
pkg/chrootarchive/archive_freebsd_test.go → pkg/chrootarchive/archive_unix_nolinux_test.go

@@ -1,3 +1,5 @@
+//go:build unix && !linux
+
 package chrootarchive // import "github.com/docker/docker/pkg/chrootarchive"
 
 import (