Fixed minor bugs with environment parsing

2021-07-16 14:32:43 +02:00
parent bc5151bd88
commit 78dbdb8f3f
7 changed files with 65 additions and 44 deletions
@@ -220,19 +220,18 @@ func buildImageMemory(fs billy.Filesystem, tags []string, dockerfileFolder strin
 	// docker build --build-arg http_proxy=http://my.proxy.url
 	// Attempt at setting name according to #359: https://github.com/frikky/Shuffle/issues/359
 	labels := map[string]string{}
-	target := ""
-	if len(tags) > 0 {
-		if strings.Contains(tags[0], ":") {
-			version := strings.Split(tags[0], ":")
-			if len(version) == 2 {
-				target = fmt.Sprintf("shuffle-build-%s", version[1])
-				tags = append(tags, target)
-				labels["name"] = target
-			}
-		}
-	}
+	//target := ""
+	//if len(tags) > 0 {
+	//	if strings.Contains(tags[0], ":") {
+	//		version := strings.Split(tags[0], ":")
+	//		if len(version) == 2 {
+	//			target = fmt.Sprintf("shuffle-build-%s", version[1])
+	//			tags = append(tags, target)
+	//			labels["name"] = target
+	//		}
+	//	}
+	//}

-	_ = labels
 	buildOptions := types.ImageBuildOptions{
 		Remove:    true,
 		Tags:      tags,