correct install aspcud in all alpine 3.5 containers, including opam-dev

bug spotted by @AltGr and @talex5 in the ocaml/opam-dev:alpine container
ocurrent · Mar 15, 2017 · 6643fb5 · 6643fb5
1 parent 8f2813e
commit 6643fb5
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/dockerfile_distro.ml b/src/dockerfile_distro.ml
@@ -245,11 +245,11 @@ let apk_opam ?pin ?opam_version ?compiler_version ~os_version labels tag =
     add_comment ?compiler_version tag @@
     header "ocaml/ocaml" tag @@
     label (("distro_style", "apk")::labels) @@
-    (match opam_version, os_version with
-     |Some "1.2", (`V3_5|`Latest) -> Linux.Apk.install "rsync xz opam aspcud"
+    (match opam_version with
+     |Some "1.2" -> Linux.Apk.install "rsync xz opam"
      |_ -> Linux.Apk.install "rsync xz" @@ install_opam_from_source ~prefix:"/usr" ?branch ()) @@
     (match os_version with
-     |`Latest|`V3_5 -> empty
+     |`Latest|`V3_5 -> Linux.Apk.install "aspcud"
      |`V3_3|`V3_4 -> Dockerfile_opam.install_cloud_solver) @@
     Linux.Apk.add_user ~sudo:true "opam" @@
     Linux.Git.init () @@