From 1757663cc4fdfc0fd4d1d40b32c66e136f0806d7 Mon Sep 17 00:00:00 2001 From: Yannick Cote Date: Wed, 17 Nov 2021 10:11:05 -0500 Subject: [PATCH] sif: limit platform to linux Signed-off-by: Yannick Cote --- sif/internal/sif_util.go | 2 ++ sif/sif/create.go | 2 ++ sif/sif/init.go | 2 ++ sif/sif/load.go | 2 ++ sif/sif/lookup.go | 2 ++ sif/sif/sif.go | 5 ++++- sif/sif_src.go | 2 ++ sif/sif_transport.go | 2 ++ transports/alltransports/alltransports.go | 2 +- transports/alltransports/sif.go | 8 ++++++++ transports/alltransports/sif_stub.go | 9 +++++++++ 11 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 transports/alltransports/sif.go create mode 100644 transports/alltransports/sif_stub.go diff --git a/sif/internal/sif_util.go b/sif/internal/sif_util.go index 88a5620c..c347d101 100644 --- a/sif/internal/sif_util.go +++ b/sif/internal/sif_util.go @@ -1,3 +1,5 @@ +// +build linux + package internal import ( diff --git a/sif/sif/create.go b/sif/sif/create.go index 1b197996..a1185e14 100644 --- a/sif/sif/create.go +++ b/sif/sif/create.go @@ -5,6 +5,8 @@ // LICENSE file distributed with the sources of this project regarding your // rights to use or distribute this software. +// +build linux + package sif import ( diff --git a/sif/sif/init.go b/sif/sif/init.go index 3e772d6b..c5c84504 100644 --- a/sif/sif/init.go +++ b/sif/sif/init.go @@ -5,6 +5,8 @@ // LICENSE file distributed with the sources of this project regarding your // rights to use or distribute this software. +// +build linux + package sif import ( diff --git a/sif/sif/load.go b/sif/sif/load.go index 40f703d5..c9b7c17a 100644 --- a/sif/sif/load.go +++ b/sif/sif/load.go @@ -5,6 +5,8 @@ // LICENSE file distributed with the sources of this project regarding your // rights to use or distribute this software. +// +build linux + package sif import ( diff --git a/sif/sif/lookup.go b/sif/sif/lookup.go index 5208e27d..a7c4253d 100644 --- a/sif/sif/lookup.go +++ b/sif/sif/lookup.go @@ -5,6 +5,8 @@ // LICENSE file distributed with the sources of this project regarding your // rights to use or distribute this software. +// +build linux + package sif import ( diff --git a/sif/sif/sif.go b/sif/sif/sif.go index d05fe5ab..964d7b72 100644 --- a/sif/sif/sif.go +++ b/sif/sif/sif.go @@ -5,6 +5,8 @@ // LICENSE file distributed with the sources of this project regarding your // rights to use or distribute this software. +// +build linux + // Package sif implements data structures and routines to create // and access SIF files. // - sif.go contains the data definition the file format. @@ -18,8 +20,9 @@ package sif import ( "bytes" - "github.com/satori/go.uuid" "os" + + uuid "github.com/satori/go.uuid" ) // Layout of a SIF file (example) diff --git a/sif/sif_src.go b/sif/sif_src.go index 089ed34b..92af2664 100644 --- a/sif/sif_src.go +++ b/sif/sif_src.go @@ -1,3 +1,5 @@ +// +build linux + package sifimage import ( diff --git a/sif/sif_transport.go b/sif/sif_transport.go index d118b73a..75752a65 100644 --- a/sif/sif_transport.go +++ b/sif/sif_transport.go @@ -1,3 +1,5 @@ +// +build linux + package sifimage import ( diff --git a/transports/alltransports/alltransports.go b/transports/alltransports/alltransports.go index 0bae8b25..9dc9b4c2 100644 --- a/transports/alltransports/alltransports.go +++ b/transports/alltransports/alltransports.go @@ -12,9 +12,9 @@ import ( _ "github.com/containers/image/v5/oci/archive" _ "github.com/containers/image/v5/oci/layout" _ "github.com/containers/image/v5/openshift" - _ "github.com/containers/image/v5/sif" _ "github.com/containers/image/v5/tarball" + // The sif transport is registered by sif*.go // The ostree transport is registered by ostree*.go // The storage transport is registered by storage*.go "github.com/containers/image/v5/transports" diff --git a/transports/alltransports/sif.go b/transports/alltransports/sif.go new file mode 100644 index 00000000..ba348f2d --- /dev/null +++ b/transports/alltransports/sif.go @@ -0,0 +1,8 @@ +// +build linux + +package alltransports + +import ( + // Register the sif transport + _ "github.com/containers/image/v5/sif" +) diff --git a/transports/alltransports/sif_stub.go b/transports/alltransports/sif_stub.go new file mode 100644 index 00000000..7715f7be --- /dev/null +++ b/transports/alltransports/sif_stub.go @@ -0,0 +1,9 @@ +// +build !linux + +package alltransports + +import "github.com/containers/image/v5/transports" + +func init() { + transports.Register(transports.NewStubTransport("sif")) +}