From dc661cb01282ccb1793dccddd06b26b87f7bc12a Mon Sep 17 00:00:00 2001
From: Lukas Fittl <lukas@fittl.com>
Date: Tue, 5 Dec 2023 18:53:35 -0800
Subject: [PATCH] CONTRIBUTING: Update docker installation steps to use
 official repo

It appears Ubuntu's "docker" snap package has broken buildx support,
so use upstream's official packages instead.
---
 CONTRIBUTING.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6881b2a20..bfb30cca1 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -69,7 +69,22 @@ Note the integration tests require Docker, and will take a while to run through.
 To run step 5 from an Ubuntu 22.04 VM, do the following:
 
 ```
-sudo snap install docker
+# Add Docker's official GPG key:
+sudo apt-get update
+sudo apt-get install ca-certificates curl gnupg
+sudo install -m 0755 -d /etc/apt/keyrings
+curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg
+sudo chmod a+r /etc/apt/keyrings/docker.gpg
+
+# Add the repository to Apt sources:
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu \
+  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt-get update
+sudo apt-get install docker-ce docker-ce-cli containerd.io docker-buildx-plugin
+
+# Add support for ARM emulation
 sudo apt update
 sudo apt install qemu-user-static binfmt-support make