resolve comments

eclipse-symphony · Jun 4, 2024 · 4c17c85 · 4c17c85
1 parent fc86fa3
commit 4c17c85
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/test/localenv/magefile.go b/test/localenv/magefile.go
@@ -20,6 +20,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
+	"runtime"
 	"strings"
 	"sync"
 	"time"
@@ -39,6 +40,8 @@ const (
 	LOG_ROOT               = "/tmp/symphony-integration-test-logs"
 )
 
+var platform = fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH)
+
 // Print parameters for mage local testing
 func PrintParams() error {
 	fmt.Println("OSS_CONTAINER_REGISTRY: ", getContainerRegistry())
@@ -388,13 +391,16 @@ func (Build) Api() error {
 	return buildAPI()
 }
 func buildAPI() error {
-	return shellcmd.Command("docker buildx build --platform \"linux/amd64\" -f ../../api/Dockerfile -t \"ghcr.io/eclipse-symphony/symphony-api\" \"../..\" --load").Run() //oss
+	imageName := "ghcr.io/eclipse-symphony/symphony-api"
+	return shellcmd.Command(fmt.Sprintf("docker buildx build --platform %s -f ../../api/Dockerfile -t %s \"../..\" --load", platform, imageName)).Run() //oss
 }
 
 func buildAgent() error {
+	pollAgentImageName := "ghcr.io/eclipse-symphony/symphony-poll-agent"
+	targetAgentImageName := "ghcr.io/eclipse-symphony/symphony-target-agent"
 	return shellcmd.RunAll(
-		shellcmd.Command("docker buildx build --platform \"linux/amd64\" -f ../../api/Dockerfile.poll-agent -t \"ghcr.io/eclipse-symphony/symphony-poll-agent\" \"../..\" --load"),
-		shellcmd.Command("docker buildx build --platform \"linux/amd64\" -f ../../api/Dockerfile.target-agent -t \"ghcr.io/eclipse-symphony/symphony-target-agent\" \"../..\" --load"),
+		shellcmd.Command(fmt.Sprintf("docker buildx build --platform %s -f ../../api/Dockerfile.poll-agent -t %s \"../..\" --load", platform, pollAgentImageName)),
+		shellcmd.Command(fmt.Sprintf("docker buildx build --platform %s -f ../../api/Dockerfile.target-agent -t %s \"../..\" --load", platform, targetAgentImageName)),
 	) //oss
 }
 
@@ -403,7 +409,8 @@ func (Build) K8s() error {
 	return buildK8s()
 }
 func buildK8s() error {
-	return shellcmd.Command("docker buildx build --platform \"linux/amd64\" -f ../../k8s/Dockerfile -t \"ghcr.io/eclipse-symphony/symphony-k8s\" \"../..\" --load").Run() //oss
+	imageName := "ghcr.io/eclipse-symphony/symphony-k8s"
+	return shellcmd.Command(fmt.Sprintf("docker buildx build --platform %s -f ../../k8s/Dockerfile -t %s \"../..\" --load", platform, imageName)).Run() //oss
 }
 
 /******************** Minikube ********************/