- renamed helper.go to imageutil.go

- image property in hydra.yaml now supports environment variables

Author: Ben Keil

cmd/cmd-build.go

@@ -17,11 +17,11 @@ import (
 )
 
 type buildCmd struct {
-	version     string
-	out         io.Writer
-	workdir     string
-	imageHelper ImageHelper
-	push        bool
+	version   string
+	out       io.Writer
+	workdir   string
+	imageUtil ImageUtil
+	push      bool
 }
 
 // BuildResponse contains the response from the docker client for "docker build"
@@ -30,7 +30,7 @@ type BuildResponse struct {
 }
 
 func newBuildCmd(out io.Writer, workdir string) *cobra.Command {
-	c := &buildCmd{out: out, workdir: workdir, imageHelper: NewDefaultImageHelper()}
+	c := &buildCmd{out: out, workdir: workdir, imageUtil: NewDefaultImageUtil()}
 
 	cmd := &cobra.Command{
 		Use:              "build VERSION",
@@ -94,7 +94,7 @@ func (c *buildCmd) run() error {
 		// Build image
 		buildResponse, err := cli.ImageBuild(context.Background(), tarfile, types.ImageBuildOptions{
 			PullParent: true,
-			Tags:       c.imageHelper.getImageTags(config, tags),
+			Tags:       c.imageUtil.getImageTags(config, tags),
 			Context:    tarfile,
 			Dockerfile: dockerfile,
 		})

cmd/cmd-push.go

@@ -16,10 +16,10 @@ import (
 )
 
 type pushCmd struct {
-	version     string
-	out         io.Writer
-	workdir     string
-	imageHelper ImageHelper
+	version   string
+	out       io.Writer
+	workdir   string
+	imageUtil ImageUtil
 }
 
 // PushResponse contains the response from the docker client for "docker build"
@@ -29,7 +29,7 @@ type PushResponse struct {
 }
 
 func newPushCmd(out io.Writer, workdir string) *cobra.Command {
-	c := &pushCmd{out: out, workdir: workdir, imageHelper: NewDefaultImageHelper()}
+	c := &pushCmd{out: out, workdir: workdir, imageUtil: NewDefaultImageUtil()}
 
 	cmd := &cobra.Command{
 		Use:              "push VERSION",
@@ -70,7 +70,7 @@ func (c *pushCmd) run() error {
 
 		// Build image
 		logger.Debugf("response from docker daemon:")
-		for _, image := range c.imageHelper.getImageTags(config, tags) {
+		for _, image := range c.imageUtil.getImageTags(config, tags) {
 			fmt.Printf("push %s\n", image)
 			pushResponse, err := cli.ImagePush(context.Background(), image, types.ImagePushOptions{
 				RegistryAuth: "hydra",

cmd/helper.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"fmt"
+	"os"
+)
+
+// ImageUtil provides some helper methods
+type ImageUtil interface {
+	getImageTags(config Config, tags []string) []string
+}
+
+// DefaultImageUtil is the default implementation for the ImageUtil interface
+type DefaultImageUtil struct {
+}
+
+// NewDefaultImageUtil creates a new instance of DefaultImageUtil
+func NewDefaultImageUtil() *DefaultImageUtil {
+	return new(DefaultImageUtil)
+}
+
+// getImageTags returns the complete image name (including registry url, image name and tag)
+func (helper *DefaultImageUtil) getImageTags(config Config, tags []string) []string {
+	// Define all images we want to build
+	imageTags := []string{}
+	for _, image := range config.Image {
+		for _, tag := range tags {
+			imageTags = append(imageTags, fmt.Sprintf("%s:%s", os.ExpandEnv(image), tag))
+		}
+	}
+	return imageTags
+}

cmd/imageutil.go

@@ -1,10 +1,7 @@
 image:
-- my.private.registry:5000/docker-common/nginx-base
+- ${DOCKER_REGISTRY}/docker-common/nginx-base
 versions:
-- directory: .
-  args:
-  dockerfile:
-  tags:
+- tags:
   - semver-nginx
   - semver
   - nginx