From 988515685ae508a5ee32ce21f2b397969e94ac9a Mon Sep 17 00:00:00 2001
From: Narthana Epa <narthana.epa@gmail.com>
Date: Sat, 25 Feb 2023 18:26:49 +1100
Subject: [PATCH] Fix qemu

---
 .buildkite/steps/build-docker-image.sh   |  5 +++++
 packaging/docker/ubuntu-22.04/Dockerfile | 15 ++++++++-------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.buildkite/steps/build-docker-image.sh b/.buildkite/steps/build-docker-image.sh
index 2763c5e2fa..8bcf24e7de 100755
--- a/.buildkite/steps/build-docker-image.sh
+++ b/.buildkite/steps/build-docker-image.sh
@@ -60,6 +60,11 @@ builder_name=$(docker buildx create --use)
 # shellcheck disable=SC2064 # we want the current $builder_name to be trapped, not the runtime one
 trap "docker buildx rm $builder_name || true" EXIT
 
+QEMU_VERSION=6.2.0
+echo "--- Installing QEMU $QEMU_VERSION"
+docker run --privileged --userns=host --rm "tonistiigi/binfmt:qemu-v$QEMU_VERSION" --uninstall qemu-*
+docker run --privileged --userns=host --rm "tonistiigi/binfmt:qemu-v$QEMU_VERSION" --install all
+
 echo "--- Building :docker: $image_tag"
 cp -a packaging/linux/root/usr/share/buildkite-agent/hooks/ "${packaging_dir}/hooks/"
 cp pkg/buildkite-agent-linux-{amd64,arm64} "$packaging_dir"
diff --git a/packaging/docker/ubuntu-22.04/Dockerfile b/packaging/docker/ubuntu-22.04/Dockerfile
index dacc68cc70..cb90d7a4f7 100644
--- a/packaging/docker/ubuntu-22.04/Dockerfile
+++ b/packaging/docker/ubuntu-22.04/Dockerfile
@@ -7,13 +7,12 @@ ARG TARGETARCH
 
 ENV DOCKER_COMPOSE_VERSION=1.27.4
 
-SHELL [ "bash", "-euc" ]
-
 RUN <<BASH
-export DEBIAN_FRONTEND=noninteractive
+#!/usr/bin/env bash
 
-curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
-add-apt-repository "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+set -eufo pipefail
+
+export DEBIAN_FRONTEND=noninteractive
 
 apt-get update
 apt-get install -y --no-install-recommends \
@@ -21,8 +20,6 @@ apt-get install -y --no-install-recommends \
   bash \
   ca-certificates \
   curl \
-  docker-ce-cli \
-  docker-compose-plugin \
   git \
   gnupg-agent \
   jq \
@@ -34,6 +31,10 @@ apt-get install -y --no-install-recommends \
   software-properties-common \
   tini
 
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add -
+add-apt-repository "deb [arch=$TARGETARCH] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+apt-get update
+apt-get install -y --no-install-recommends docker-ce-cli docker-compose-plugin
 rm -rf /var/lib/apt/lists/*
 
 pip3 install docker-compose==$DOCKER_COMPOSE_VERSION