From 6643fb5982b7bcb99a11e4b86adc9c3b9960470f Mon Sep 17 00:00:00 2001 From: Anil Madhavapeddy Date: Wed, 15 Mar 2017 17:53:33 +0000 Subject: [PATCH] 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 --- src/dockerfile_distro.ml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/dockerfile_distro.ml b/src/dockerfile_distro.ml index cc3bbdf3..e88421bd 100644 --- 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 () @@