container, tests: support docker image repository and tag

container/container.go

@@ -0,0 +1,24 @@
+// Copyright 2017 AMIS Technologies
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package container
+
+func (eth *ethereum) Image() string {
+	if eth.imageTag == "" {
+		return eth.imageRepository + ":latest"
+	}
+	return eth.imageRepository + ":" + eth.imageTag
+}

container/ethereum.go

@@ -68,27 +68,30 @@ type ethereum struct {
 	rpcPort     string
 	hostName    string
 	containerID string
-	imageName   string
+
-	logging     bool
+	imageRepository string
-	client      *client.Client
+	imageTag        string
+
+	logging bool
+	client  *client.Client
 }
 
 func (eth *ethereum) Init(genesisFile string) error {
 	filters := filters.NewArgs()
-	filters.Add("reference", eth.imageName)
+	filters.Add("reference", eth.Image())
 
 	images, err := eth.client.ImageList(context.Background(), types.ImageListOptions{
 		Filters: filters,
 	})
 	if err != nil {
-		log.Printf("Cannot search %s, err: %v", eth.imageName, err)
+		log.Printf("Cannot search %s, err: %v", eth.Image(), err)
 		return err
 	}
 
 	if len(images) == 0 {
-		out, err := eth.client.ImagePull(context.Background(), eth.imageName, types.ImagePullOptions{})
+		out, err := eth.client.ImagePull(context.Background(), eth.Image(), types.ImagePullOptions{})
 		if err != nil {
-			log.Printf("Cannot pull %s, err: %v", eth.imageName, err)
+			log.Printf("Cannot pull %s, err: %v", eth.Image(), err)
 			return err
 		}
 		if eth.logging {
@@ -100,7 +103,7 @@ func (eth *ethereum) Init(genesisFile string) error {
 
 	resp, err := eth.client.ContainerCreate(context.Background(),
 		&container.Config{
-			Image: eth.imageName,
+			Image: eth.Image(),
 			Cmd: []string{
 				"init",
 				"--" + utils.DataDirFlag.Name,
@@ -133,7 +136,7 @@ func (eth *ethereum) Start() error {
 	resp, err := eth.client.ContainerCreate(context.Background(),
 		&container.Config{
 			Hostname: "geth-" + eth.hostName,
-			Image:    eth.imageName,
+			Image:    eth.Image(),
 			Cmd:      eth.flags,
 			ExposedPorts: map[nat.Port]struct{}{
 				nat.Port(eth.port):    {},
@@ -235,6 +238,8 @@ func (eth *ethereum) Running() bool {
 	return false
 }
 
+// ----------------------------------------------------------------------------
+
 func (eth *ethereum) showLog(context context.Context) {
 	if readCloser, err := eth.client.ContainerLogs(context, eth.containerID,
 		types.ContainerLogsOptions{ShowStderr: true, Follow: true}); err == nil {

container/ethereum_test.go

@@ -36,7 +36,8 @@ func TestEthereumContainer(t *testing.T) {
 	for _, env := range envs {
 		geth := NewEthereum(
 			env.Client,
-			ImageName("quay.io/amis/geth:istanbul_develop"),
+			ImageRepository("quay.io/amis/geth"),
+			ImageTag("istanbul_develop"),
 			HostDataDir(env.DataDir),
 			DataDir("/data"),
 			Port(fmt.Sprintf("%d", env.P2PPort)),

container/options.go

@@ -24,9 +24,15 @@ import (
 
 type Option func(*ethereum)
 
-func ImageName(imageName string) Option {
+func ImageRepository(repository string) Option {
 	return func(eth *ethereum) {
-		eth.imageName = imageName
+		eth.imageRepository = repository
+	}
+}
+
+func ImageTag(tag string) Option {
+	return func(eth *ethereum) {
+		eth.imageTag = tag
 	}
 }
 

tests/integration_test.go

@@ -51,7 +51,8 @@ var _ = Describe("4 validators Istanbul", func() {
 		for _, env := range envs {
 			geth := container.NewEthereum(
 				env.Client,
-				container.ImageName("quay.io/amis/geth:istanbul_develop"),
+				container.ImageRepository("quay.io/amis/geth"),
+				container.ImageTag("istanbul_develop"),
 				container.HostDataDir(env.DataDir),
 				container.DataDir("/data"),
 				container.Port(fmt.Sprintf("%d", env.P2PPort)),