Merge pull request #588 from rgooch/master

Make builder-tool with build-image subcommand compile and work on MacOS.

cmd/builder-tool/buildImage.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (

cmd/builder-tool/main.go

@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
@@ -36,7 +34,7 @@ var (
 	maxSourceAge = flag.Duration("maxSourceAge", time.Hour,
 		"Maximum age of a source image before it is rebuilt")
 
-	minimumExpiration = 15 * time.Minute
+	minimumExpiration = 5 * time.Minute
 )
 
 func printUsage() {

cmd/builder-tool/stub.go

@@ -4,9 +4,23 @@ package main
 
 import (
 	"os"
+
+	"github.com/Symantec/Dominator/lib/log"
 )
 
-func main() {
+func notAvailable() {
 	os.Stderr.Write([]byte("Not available on this OS\n"))
 	os.Exit(1)
 }
+
+func buildFromManifestSubcommand(args []string, logger log.Logger) {
+	notAvailable()
+}
+
+func buildTreeFromManifestSubcommand(args []string, logger log.Logger) {
+	notAvailable()
+}
+
+func processManifestSubcommand(args []string, logger log.Logger) {
+	notAvailable()
+}