image-add, image-load: New commands.

Signed-off-by: Matthieu Nottale <[email protected]>

Author: Matthieu Nottale

cmd/image-add.go

@@ -0,0 +1,42 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/docker/lunchbox/image"
+	"github.com/spf13/cobra"
+)
+
+var imageAddCmd = &cobra.Command{
+	Use:   "image-add <app-name> [services...]",
+	Short: "Add images for given services (default: all) to the app package",
+	Args:  cobra.MinimumNArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		d := make(map[string]string)
+		for _, v := range imageAddEnv {
+			kv := strings.SplitN(v, "=", 2)
+			if len(kv) != 2 {
+				fmt.Printf("Malformed env input: '%s'\n", v)
+				os.Exit(1)
+			}
+			d[kv[0]] = kv[1]
+		}
+		err := image.Add(args[0], args[1:], imageAddComposeFiles, imageAddSettingsFile, d)
+		if err != nil {
+			fmt.Printf("%v\n", err)
+			os.Exit(1)
+		}
+	},
+}
+var imageAddComposeFiles []string
+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")
+}

cmd/image-load.go

@@ -0,0 +1,26 @@
+package cmd
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/docker/lunchbox/image"
+	"github.com/spf13/cobra"
+)
+
+var imageLoadCmd = &cobra.Command{
+	Use:   "image-load <app-name> [services...]",
+	Short: "Load stored images for given services (default: all) to the local docker daemon",
+	Args:  cobra.MinimumNArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		err := image.Load(args[0], args[1:])
+		if err != nil {
+			fmt.Printf("%v\n", err)
+			os.Exit(1)
+		}
+	},
+}
+
+func init() {
+	rootCmd.AddCommand(imageLoadCmd)
+}

image/image.go

@@ -0,0 +1,91 @@
+package image
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"path"
+
+	"github.com/docker/lunchbox/packager"
+	"github.com/docker/lunchbox/renderer"
+	"github.com/docker/lunchbox/utils"
+)
+
+func contains(list []string, needle string) bool {
+	for _, e := range list {
+		if e == needle {
+			return true
+		}
+	}
+	return false
+}
+
+// Add add service images to the app package
+func Add(appname string, services []string, composeFiles []string, settingsFile []string, env map[string]string) error {
+	oappname := appname
+	appname, cleanup, err := packager.Extract(appname)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
+	config, err := renderer.Render(appname, composeFiles, settingsFile, env)
+	if err != nil {
+		return err
+	}
+	os.Mkdir(path.Join(appname, "images"), 0755)
+	for _, s := range config.Services {
+		if len(services) != 0 && !contains(services, s.Name) {
+			continue
+		}
+		cmd := exec.Command("docker", "save", "-o", path.Join(appname, "images", s.Name), s.Image)
+		output, err := cmd.CombinedOutput()
+		if err != nil {
+			fmt.Println(output)
+			return err
+		}
+	}
+	// check if source was a tarball
+	s, err := os.Stat(oappname)
+	if err != nil {
+		// try appending our extension
+		oappname = utils.DirNameFromAppName(oappname)
+		s, err = os.Stat(oappname)
+	}
+	if err != nil {
+		return err // this shouldn't happen
+	}
+	if !s.IsDir() {
+		// source was a tarball, rebuild it
+		return packager.Pack(appname, oappname)
+	}
+	return nil
+}
+
+// Load loads app packed images to the docker daemon
+func Load(appname string, services []string) error {
+	appname, cleanup, err := packager.Extract(appname)
+	if err != nil {
+		return err
+	}
+	defer cleanup()
+	imageDir, err := os.Open(path.Join(appname, "images"))
+	if err != nil {
+		return fmt.Errorf("no images found in app")
+	}
+	images, err := imageDir.Readdirnames(0)
+	if err != nil {
+		return err
+	}
+	for _, i := range images {
+		if len(services) != 0 && !contains(services, i) {
+			continue
+		}
+		cmd := exec.Command("docker", "load", "-i", path.Join(appname, "images", i))
+		output, err := cmd.CombinedOutput()
+		if err != nil {
+			fmt.Println(output)
+			return err
+		}
+	}
+	return nil
+}