From 0f094dd2669c9c0d98d31e03b85d30ced864ff4a Mon Sep 17 00:00:00 2001
From: Jonathan Hui <jonhui@google.com>
Date: Mon, 27 Jan 2025 19:57:19 -0800
Subject: [PATCH] [docker] fix multi-arch docker builds (#11199)

---
 .github/workflows/docker.yml      | 5 +++++
 etc/docker/environment/Dockerfile | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 474894308..e356657d7 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -85,6 +85,11 @@ jobs:
           --build-arg VCS_REF=${GITHUB_SHA::8} \
           ${TAGS} --file ${DOCKER_FILE} ." >> $GITHUB_OUTPUT
 
+    - name: Set up QEMU
+      uses: docker/setup-qemu-action@v3
+      with:
+        image: tonistiigi/binfmt:qemu-v8.1.5
+
     - name: Set up Docker Buildx
       uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
 
diff --git a/etc/docker/environment/Dockerfile b/etc/docker/environment/Dockerfile
index a7c38f869..f4e8a5d87 100644
--- a/etc/docker/environment/Dockerfile
+++ b/etc/docker/environment/Dockerfile
@@ -4,6 +4,12 @@ FROM ubuntu:22.04
 ENV DEBIAN_FRONTEND noninteractive
 ENV LANG en_US.UTF-8
 
+# Resolves issue with installing libc-bin
+RUN rm /var/lib/dpkg/info/libc-bin.* \
+    && apt-get clean -y \
+    && apt-get update -y \
+    && apt-get install --no-install-recommends -y libc-bin
+
 RUN set -x \
     && apt-get update -y \
     && apt-get install -y locales \