From a181cc1d7061a2ecd6edced1c8c750b3a7387bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= <antonin@tarides.com>
Date: Mon, 6 Mar 2023 16:20:37 +0100
Subject: [PATCH] Use DockerHub user risvc64/ubuntu

https://github.com/docker-library/official-images#architectures-other-than-amd64
https://hub.docker.com/r/riscv64/ubuntu
---
 CHANGES.md         | 1 +
 src-opam/distro.ml | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 77f14148..3d1bbf5f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,7 @@
 unreleased
 ----------
 
+- Use DockerHub user risvc64/ubuntu. (@MisterDA, #150)
 - Various LCU Updates (@mtelvers #144 #136 #135)
 - Support mounts, networks, and security parameters in RUN
   commands, add buildkit_syntax helper function.
diff --git a/src-opam/distro.ml b/src-opam/distro.ml
index 1ca1b03f..6bc5bac5 100644
--- a/src-opam/distro.ml
+++ b/src-opam/distro.ml
@@ -1290,7 +1290,7 @@ let base_distro_tag ?win10_revision ?(arch = `X86_64) d =
       | `Ppc64le, (`V8 | `V9 | `V10) -> ("ppc64le/debian", tag)
       | `S390x, (`V8 | `V9 | `V10) -> ("s390x/debian", tag)
       | _ -> ("debian", tag))
-  | `Ubuntu v ->
+  | `Ubuntu v -> (
       let tag =
         match v with
         | `V12_04 -> "precise"
@@ -1312,7 +1312,9 @@ let base_distro_tag ?win10_revision ?(arch = `X86_64) d =
         | `V22_04 -> "jammy"
         | `V22_10 -> "kinetic"
       in
-      ("ubuntu", tag)
+      match arch with
+      | `Riscv64 -> ("riscv64/ubuntu", tag)
+      | _ -> ("ubuntu", tag))
   | `CentOS v ->
       let tag = match v with `V6 -> "6" | `V7 -> "7" | `V8 -> "8" in
       ("centos", tag)