fix dmsg-disc and dmsg-server DockerfileInt

skycoin · Nov 3, 2024 · 66cd4ae · 66cd4ae
1 parent 427fbc8
commit 66cd4ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/docker/docker_build.sh b/docker/docker_build.sh
@@ -69,6 +69,7 @@ if [[ "$image_tag" == "e2e" ]]; then
   DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/dmsg-discovery/Dockerfile \
     --build-arg build_opts="$go_buildopts" \
     --build-arg image_tag="$image_tag" \
+    $platform \
     --build-arg base_image="skycoin/dmsg-discovery:$dockerhub_image_tag" \
     -t "$registry"/dmsg-discovery:"$image_tag" .
 
@@ -77,6 +78,7 @@ if [[ "$image_tag" == "e2e" ]]; then
     --build-arg base_image="skycoin/dmsg-server:$dockerhub_image_tag" \
     --build-arg build_opts="$go_buildopts" \
     --build-arg image_tag="$image_tag" \
+    $platform \
     -t "$registry"/dmsg-server:"$image_tag" .
 
   echo "build service discovery image"
@@ -103,23 +105,27 @@ if [[ "$image_tag" == "integration" ]]; then
   echo "BUILDING SKYWIRE VISOR"
 
   DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/skywire-visor/DockerfileInt \
+    $platform \
     -t "$registry"/skywire-visor:"$image_tag" .
 
   echo ============ Base images ready ======================
 
   echo "build dmsg discovery image"
   DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/dmsg-discovery/DockerfileInt \
+    $platform \
     -t "$registry"/dmsg-discovery:"$image_tag" .
 
   echo "build dmsg server image"
   DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/dmsg-server/DockerfileInt \
+    $platform \
     -t "$registry"/dmsg-server:"$image_tag" .
 
   echo "build service discovery image"
   DOCKER_BUILDKIT="$bldkit" docker build -f docker/images/service-discovery/Dockerfile \
     --build-arg base_image="$base_image" \
     --build-arg build_opts="$go_buildopts" \
     --build-arg image_tag="$image_tag" \
+    $platform \
     -t "$registry"/service-discovery:"$image_tag" .
 
   rm -rf ./tmp/*

diff --git a/docker/images/dmsg-discovery/DockerfileInt b/docker/images/dmsg-discovery/DockerfileInt
@@ -2,8 +2,6 @@ FROM golang:1.23-alpine AS builder
 ARG CGO_ENABLED=0
 
 ENV CGO_ENABLED=${CGO_ENABLED} \
-	GOOS=linux  \
-	GOARCH=amd64 \
 	GO111MODULE=on
 
 COPY /tmp/dmsg /dmsg

diff --git a/docker/images/dmsg-server/DockerfileInt b/docker/images/dmsg-server/DockerfileInt
@@ -2,8 +2,6 @@ FROM golang:1.23-alpine AS builder
 ARG CGO_ENABLED=0
 
 ENV CGO_ENABLED=${CGO_ENABLED} \
-	GOOS=linux  \
-	GOARCH=amd64 \
 	GO111MODULE=on
 
 COPY /tmp/dmsg /dmsg