From 874024adc06827218c4f83c2b36ba136218c507d Mon Sep 17 00:00:00 2001 From: Richard Gooch Date: Sun, 7 Apr 2019 08:30:55 -0700 Subject: [PATCH] Make builder-tool with build-image subcommand compile and work on MacOS. --- cmd/builder-tool/buildImage.go | 2 -- cmd/builder-tool/main.go | 4 +--- cmd/builder-tool/stub.go | 16 +++++++++++++++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/cmd/builder-tool/buildImage.go b/cmd/builder-tool/buildImage.go index 50f1e845..d179b5b2 100644 --- a/cmd/builder-tool/buildImage.go +++ b/cmd/builder-tool/buildImage.go @@ -1,5 +1,3 @@ -// +build linux - package main import ( diff --git a/cmd/builder-tool/main.go b/cmd/builder-tool/main.go index 4063e9ce..fc32a2b5 100644 --- a/cmd/builder-tool/main.go +++ b/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() { diff --git a/cmd/builder-tool/stub.go b/cmd/builder-tool/stub.go index 4f4a44a3..b51572ed 100644 --- a/cmd/builder-tool/stub.go +++ b/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() +}