Merge pull request #33 from mnottale/experimental

Add experimental build flag. Only leave out init, inspect, helm and render

Author: mnottale

Makefile

@@ -1,6 +1,9 @@
 PKG_NAME := github.com/docker/lunchbox
 BIN_NAME := docker-app
 
+# Enable experimental features. "on" or "off"
+EXPERIMENTAL := off
+
 TAG ?= $(shell git describe --always --dirty)
 COMMIT ?= $(shell git rev-parse --short HEAD)
 
@@ -18,7 +21,8 @@ IMAGE_BUILD_ARGS := \
 
 LDFLAGS := "-s -w \
 	-X $(PKG_NAME)/internal.GitCommit=$(COMMIT) \
-	-X $(PKG_NAME)/internal.Version=$(TAG)"
+	-X $(PKG_NAME)/internal.Version=$(TAG)      \
+	-X $(PKG_NAME)/internal.Experimental=$(EXPERIMENTAL)"
 
 #####################
 # Local Development #

cmd/build.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/docker/lunchbox/internal"
 	"github.com/spf13/cobra"
 )
 
@@ -16,5 +17,7 @@ var buildCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(buildCmd)
+	if internal.Experimental == "on" {
+		rootCmd.AddCommand(buildCmd)
+	}
 }

cmd/deploy.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"fmt"
 
+	"github.com/docker/lunchbox/internal"
 	"github.com/spf13/cobra"
 )
 
@@ -16,7 +17,9 @@ var deployCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(deployCmd)
+	if internal.Experimental == "on" {
+		rootCmd.AddCommand(deployCmd)
+	}
 
 	// Here you will define your flags and configuration settings.
 

cmd/image-add.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/docker/lunchbox/image"
+	"github.com/docker/lunchbox/internal"
 	"github.com/spf13/cobra"
 )
 
@@ -35,8 +36,10 @@ var imageAddSettingsFile []string
 var imageAddEnv []string
 
 func init() {
-	rootCmd.AddCommand(imageAddCmd)
-	imageAddCmd.Flags().StringArrayVarP(&imageAddComposeFiles, "compose-files", "c", []string{}, "Override Compose files")
-	imageAddCmd.Flags().StringArrayVarP(&imageAddSettingsFile, "settings-files", "s", []string{}, "Override settings files")
-	imageAddCmd.Flags().StringArrayVarP(&imageAddEnv, "env", "e", []string{}, "Override environment values")
+	if internal.Experimental == "on" {
+		rootCmd.AddCommand(imageAddCmd)
+		imageAddCmd.Flags().StringArrayVarP(&imageAddComposeFiles, "compose-files", "c", []string{}, "Override Compose files")
+		imageAddCmd.Flags().StringArrayVarP(&imageAddSettingsFile, "settings-files", "s", []string{}, "Override settings files")
+		imageAddCmd.Flags().StringArrayVarP(&imageAddEnv, "env", "e", []string{}, "Override environment values")
+	}
 }

cmd/image-load.go

@@ -5,6 +5,7 @@ import (
 	"os"
 
 	"github.com/docker/lunchbox/image"
+	"github.com/docker/lunchbox/internal"
 	"github.com/spf13/cobra"
 )
 
@@ -22,5 +23,7 @@ var imageLoadCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(imageLoadCmd)
+	if internal.Experimental == "on" {
+		rootCmd.AddCommand(imageLoadCmd)
+	}
 }

cmd/load.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
@@ -22,5 +23,7 @@ var loadCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(loadCmd)
+	if internal.Experimental == "on" {
+		rootCmd.AddCommand(loadCmd)
+	}
 }

cmd/pack.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
@@ -24,6 +25,8 @@ var packCmd = &cobra.Command{
 var packOutputFile string
 
 func init() {
-	rootCmd.AddCommand(packCmd)
-	packCmd.Flags().StringVarP(&packOutputFile, "output", "o", "-", "Output file (- for stdout)")
+	if internal.Experimental == "on" {
+		rootCmd.AddCommand(packCmd)
+		packCmd.Flags().StringVarP(&packOutputFile, "output", "o", "-", "Output file (- for stdout)")
+	}
 }

cmd/pull.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
@@ -22,5 +23,7 @@ var pullCmd = &cobra.Command{
 }
 
 func init() {
-	rootCmd.AddCommand(pullCmd)
+	if internal.Experimental == "on" {
+		rootCmd.AddCommand(pullCmd)
+	}
 }

cmd/push.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
@@ -30,7 +31,9 @@ var (
 )
 
 func init() {
-	rootCmd.AddCommand(pushCmd)
-	pushCmd.Flags().StringVarP(&pushPrefix, "prefix", "p", "", "prefix to use")
-	pushCmd.Flags().StringVarP(&pushTag, "tag", "t", "latest", "tag to use")
+	if internal.Experimental == "on" {
+		rootCmd.AddCommand(pushCmd)
+		pushCmd.Flags().StringVarP(&pushPrefix, "prefix", "p", "", "prefix to use")
+		pushCmd.Flags().StringVarP(&pushTag, "tag", "t", "latest", "tag to use")
+	}
 }

cmd/save.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/docker/lunchbox/internal"
 	"github.com/docker/lunchbox/packager"
 	"github.com/spf13/cobra"
 )
@@ -30,7 +31,9 @@ var (
 )
 
 func init() {
-	rootCmd.AddCommand(saveCmd)
-	saveCmd.Flags().StringVarP(&savePrefix, "prefix", "p", "", "prefix to use")
-	saveCmd.Flags().StringVarP(&saveTag, "tag", "t", "latest", "tag to use")
+	if internal.Experimental == "on" {
+		rootCmd.AddCommand(saveCmd)
+		saveCmd.Flags().StringVarP(&savePrefix, "prefix", "p", "", "prefix to use")
+		saveCmd.Flags().StringVarP(&saveTag, "tag", "t", "latest", "tag to use")
+	}
 }