Merge pull request #1110 from yyb196/two_tag

bugfix: do not append latest to image name having a tag already

apis/server/image_bridge.go

@@ -30,6 +30,10 @@ func (s *Server) pullImage(ctx context.Context, rw http.ResponseWriter, req *htt
 
 	if tag == "" {
 		tag = "latest"
+		if index := strings.LastIndex(image, ":"); index > 0 {
+			tag = image[index+1:]
+			image = image[:index]
+		}
 	}
 	// record the time spent during image pull procedure.
 	defer func(start time.Time) {

apis/server/image_bridge_test.go

@@ -0,0 +1,38 @@
+package server
+
+import (
+	"context"
+	"io"
+	"net/http"
+	"testing"
+
+	"github.com/alibaba/pouch/apis/types"
+	"github.com/alibaba/pouch/daemon/mgr"
+	"github.com/stretchr/testify/assert"
+)
+
+type mockImgePull struct {
+	mgr.ImageMgr
+	handler func(ctx context.Context, imageRef string, authConfig *types.AuthConfig, out io.Writer) error
+}
+
+func (m *mockImgePull) PullImage(ctx context.Context, imageRef string, authConfig *types.AuthConfig, out io.Writer) error {
+	return m.handler(ctx, imageRef, authConfig, out)
+}
+
+func Test_pullImage_without_tag(t *testing.T) {
+	var s Server
+
+	s.ImageMgr = &mockImgePull{
+		ImageMgr: &mgr.ImageManager{},
+		handler: func(ctx context.Context, imageRef string, authConfig *types.AuthConfig, out io.Writer) error {
+			assert.Equal(t, "reg.abc.com/base/os:7.2", imageRef)
+			return nil
+		},
+	}
+	req := &http.Request{
+		Form:   map[string][]string{"fromImage": {"reg.abc.com/base/os:7.2"}},
+		Header: map[string][]string{},
+	}
+	s.pullImage(context.Background(), nil, req)
+}