diff options
| author | Emilio Jesus Gallego Arias | 2018-09-10 11:37:09 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2018-09-21 01:01:02 +0200 |
| commit | 81e4c7152da598c1750e7881b197a6fcf54e818d (patch) | |
| tree | 04b28f3ccc82a436b6202840477a3f5889f98745 /dev/ci/docker | |
| parent | 8f23d8d339403006d6464510c7d2cd285cf38b0a (diff) | |
[dune] [configure] Allow to set prefix using environment variable.
This is a hack to enable correct OPAM building, the medium-term plan
is to avoid having to set a prefix at configure time but instead using
a set of rules to locate the Coq library.
We use `(env_var ...)` in a dependency rule, which a feature of Dune 1.2
Diffstat (limited to 'dev/ci/docker')
| -rw-r--r-- | dev/ci/docker/bionic_coq/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dev/ci/docker/bionic_coq/Dockerfile b/dev/ci/docker/bionic_coq/Dockerfile index 9fad274bf4..d943795258 100644 --- a/dev/ci/docker/bionic_coq/Dockerfile +++ b/dev/ci/docker/bionic_coq/Dockerfile @@ -1,4 +1,4 @@ -# CACHEKEY: "bionic_coq-V2018-09-20-V2" +# CACHEKEY: "bionic_coq-V2018-09-21-V2" # ^^ Update when modifying this file. FROM ubuntu:bionic @@ -34,7 +34,7 @@ RUN opam init -a -y -j $NJOBS --compiler="$COMPILER" default https://opam.ocaml. # Common OPAM packages. # `num` does not have a version number as the right version to install varies # with the compiler version. -ENV BASE_OPAM="num ocamlfind.1.8.0 dune.1.1.1 ounit.2.0.8" \ +ENV BASE_OPAM="num ocamlfind.1.8.0 dune.1.2.1 ounit.2.0.8" \ CI_OPAM="menhir.20180530 elpi.1.0.5 ocamlgraph.1.8.8" # BASE switch; CI_OPAM contains Coq's CI dependencies. |