瀏覽代碼

Remove usage of runconfig.ConvertKVStringsToMap in the API client library.

It's a very simple function that we can duplicate.

Signed-off-by: David Calavera <david.calavera@gmail.com>
David Calavera 9 年之前
父節點
當前提交
747dccde41
共有 1 個文件被更改,包括 17 次插入1 次删除
  1. 17 1
      api/client/lib/image_build.go

+ 17 - 1
api/client/lib/image_build.go

@@ -7,6 +7,7 @@ import (
 	"net/url"
 	"regexp"
 	"strconv"
+	"strings"
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/runconfig"
@@ -101,7 +102,7 @@ func imageBuildOptionsToQuery(options types.ImageBuildOptions) (url.Values, erro
 	}
 	query.Set("ulimits", string(ulimitsJSON))
 
-	buildArgs := runconfig.ConvertKVStringsToMap(options.BuildArgs)
+	buildArgs := convertKVStringsToMap(options.BuildArgs)
 	buildArgsJSON, err := json.Marshal(buildArgs)
 	if err != nil {
 		return query, err
@@ -119,3 +120,18 @@ func getDockerOS(serverHeader string) string {
 	}
 	return osType
 }
+
+// convertKVStringsToMap converts ["key=value"] to {"key":"value"}
+func convertKVStringsToMap(values []string) map[string]string {
+	result := make(map[string]string, len(values))
+	for _, value := range values {
+		kv := strings.SplitN(value, "=", 2)
+		if len(kv) == 1 {
+			result[kv[0]] = ""
+		} else {
+			result[kv[0]] = kv[1]
+		}
+	}
+
+	return result
+}