From 11749c49024029d61cba5d74dd5ed36c449f8a8a Mon Sep 17 00:00:00 2001 From: Alex Date: Sun, 9 Oct 2016 19:37:53 +0200 Subject: [PATCH] Provide DIND override through DIND_IMAGE env variable. Use pinned version of DIND by default instead of latest to prevent surprises. --- services/docker.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/docker.go b/services/docker.go index c30408c..21ea4f8 100644 --- a/services/docker.go +++ b/services/docker.go @@ -2,6 +2,7 @@ package services import ( "log" + "os" "strings" ptypes "github.com/franela/play-with-docker/types" @@ -81,7 +82,12 @@ func CreateInstance(net string) (*ptypes.Instance, error) { h := &container.HostConfig{NetworkMode: container.NetworkMode(net), Privileged: true} h.Resources.PidsLimit = maximumPidLimit - conf := &container.Config{Image: "docker:dind"} + dindImage := os.Getenv("DIND_IMAGE") + if len(dindImage) == 0 { + dindImage = "docker:1.12.2-rc2-dind" + } + + conf := &container.Config{Image: dindImage} container, err := c.ContainerCreate(context.Background(), conf, h, nil, "") if err != nil {