Use DockerHub user risvc64/ubuntu

https://github.com/docker-library/official-images#architectures-other-than-amd64 https://hub.docker.com/r/riscv64/ubuntu
ocurrent · Mar 6, 2023 · bcc6d7c · bcc6d7c
1 parent fca399a
commit bcc6d7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,7 @@
 unreleased
 ----------
 
+- Use DockerHub user risvc64/ubuntu. (@MisterDA, #150)
 - Optimize Linux package install. (@MisterDA #147)
 - Various LCU Updates (@mtelvers #144 #136 #135)
 - Support mounts, networks, and security parameters in RUN

diff --git 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)