build docker image for amd64 (#28301)

keybase · Jan 21, 2025 · 063f48e · 063f48e
1 parent 7aab59f
commit 063f48e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/packaging/linux/docker/build.sh b/packaging/linux/docker/build.sh
@@ -28,6 +28,7 @@ for variant in "${variants[@]}"; do
 
   if [ "$base_variant" = "null" ]; then
     docker build \
+      --platform=linux/amd64 \
       --pull \
       --build-arg SOURCE_COMMIT="$source_commit" \
       --build-arg SIGNING_FINGERPRINT="$code_signing_fingerprint" \
@@ -36,6 +37,7 @@ for variant in "${variants[@]}"; do
       "$client_dir"
   else
     docker build \
+      --platform=linux/amd64 \
       --build-arg BASE_IMAGE="$image_name:$tag$base_variant" \
       -f "$client_dir/$dockerfile" \
       -t "$image_name:$tag$variant" \

diff --git a/packaging/linux/docker_build.sh b/packaging/linux/docker_build.sh
@@ -58,10 +58,10 @@ gpg_tempfile="$gpg_tempdir/code_signing_key"
 gpg --export-secret-key --armor "$code_signing_fingerprint" > "$gpg_tempfile"
 
 # Make sure the Docker image is built.
-image=keybase_packaging_v52
+image=keybase_packaging_v53
 if [ -z "$(sudo docker images -q "$image")" ] ; then
   echo "Docker image '$image' not yet built. Building..."
-  sudo docker build -t "$image" "$clientdir/packaging/linux"
+  sudo docker build --platform=linux/amd64 -t "$image" "$clientdir/packaging/linux"
 fi
 
 # Run the docker job in interactive mode if we're actually talking to a